From: Olivier Lamy Date: Thu, 3 Nov 2011 14:31:06 +0000 (+0000) Subject: fix archiva-xmlrpc-services unit tests X-Git-Tag: archiva-1.4-M2~171 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35043074476f5c7982cb767575b52354f9263b6b;p=archiva.git fix archiva-xmlrpc-services unit tests git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197142 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml index ffaf75ffa..8e55004c2 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml @@ -68,4 +68,6 @@ + + \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java index 2ae481a94..f4c99b2fe 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java @@ -63,6 +63,7 @@ import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -158,6 +159,11 @@ public class DefaultManagedRepositoryAdmin List managedRepoConfigs = getArchivaConfiguration().getConfiguration().getManagedRepositories(); + if ( managedRepoConfigs == null ) + { + return Collections.emptyList(); + } + List managedRepos = new ArrayList( managedRepoConfigs.size() ); for ( ManagedRepositoryConfiguration repoConfig : managedRepoConfigs ) @@ -739,4 +745,24 @@ public class DefaultManagedRepositoryAdmin { this.repositoryTaskScheduler = repositoryTaskScheduler; } + + public PlexusSisuBridge getPlexusSisuBridge() + { + return plexusSisuBridge; + } + + public void setPlexusSisuBridge( PlexusSisuBridge plexusSisuBridge ) + { + this.plexusSisuBridge = plexusSisuBridge; + } + + public MavenIndexerUtils getMavenIndexerUtils() + { + return mavenIndexerUtils; + } + + public void setMavenIndexerUtils( MavenIndexerUtils mavenIndexerUtils ) + { + this.mavenIndexerUtils = mavenIndexerUtils; + } } diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index e6e29b310..45efa378f 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -106,6 +106,42 @@ archiva-configuration runtime + + org.apache.jackrabbit + jackrabbit-core + test + + + commons-logging + commons-logging + + + + + org.apache.derby + derby + test + + + org.codehaus.redback + redback-keys-memory + test + + + org.codehaus.redback + redback-rbac-cached + test + + + org.codehaus.redback + redback-rbac-memory + test + + + org.codehaus.redback + redback-users-memory + test + @@ -119,6 +155,17 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.build.directory}/appserver-base + ${project.build.directory}/appserver-base + ${project.build.testOutputDirectory} + + + diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java index ff2cb54fd..0ed7cdc39 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java @@ -29,6 +29,17 @@ import org.apache.archiva.admin.repository.proxyconnector.DefaultProxyConnectorA import org.apache.archiva.admin.repository.remote.DefaultRemoteRepositoryAdmin; import org.apache.archiva.audit.AuditEvent; import org.apache.archiva.audit.AuditListener; +import org.apache.archiva.common.plexusbridge.MavenIndexerUtils; +import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; +import org.apache.archiva.configuration.ArchivaConfiguration; +import org.apache.archiva.configuration.Configuration; +import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.configuration.RepositoryScanningConfiguration; +import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; +import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.RepositorySession; @@ -36,7 +47,13 @@ import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.apache.archiva.metadata.repository.filter.Filter; import org.apache.archiva.metadata.repository.filter.IncludesFilter; import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager; +import org.apache.archiva.model.ArtifactReference; +import org.apache.archiva.repository.RepositoryContentFactory; +import org.apache.archiva.repository.content.ManagedDefaultRepositoryContent; +import org.apache.archiva.repository.content.ManagedLegacyRepositoryContent; +import org.apache.archiva.repository.content.PathParser; import org.apache.archiva.repository.events.RepositoryListener; +import org.apache.archiva.repository.layout.LayoutException; import org.apache.archiva.repository.scanner.RepositoryContentConsumers; import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.RepositoryTask; @@ -46,31 +63,18 @@ import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository; import org.apache.archiva.web.xmlrpc.api.beans.RemoteRepository; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.configuration.FileTypes; -import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.configuration.RepositoryGroupConfiguration; -import org.apache.archiva.configuration.RepositoryScanningConfiguration; -import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; -import org.apache.archiva.consumers.KnownRepositoryContentConsumer; -import org.apache.archiva.model.ArtifactReference; -import org.apache.archiva.repository.RepositoryContentFactory; -import org.apache.archiva.repository.content.ManagedDefaultRepositoryContent; -import org.apache.archiva.repository.content.ManagedLegacyRepositoryContent; -import org.apache.archiva.repository.content.PathParser; -import org.apache.archiva.repository.layout.LayoutException; import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.registry.Registry; import org.easymock.MockControl; import org.easymock.classextension.MockClassControl; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import javax.inject.Inject; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -170,6 +174,12 @@ public class AdministrationServiceImplTest private DefaultRepositoryGroupAdmin repositoryGroupAdmin; + @Inject + PlexusSisuBridge plexusSisuBridge; + + @Inject + MavenIndexerUtils mavenIndexerUtils; + @Before public void setUp() throws Exception @@ -182,6 +192,8 @@ public class AdministrationServiceImplTest configControl = MockClassControl.createControl( Configuration.class ); config = (Configuration) configControl.getMock(); + + repositoryTaskSchedulerControl = MockClassControl.createControl( RepositoryArchivaTaskScheduler.class ); repositoryTaskScheduler = (RepositoryArchivaTaskScheduler) repositoryTaskSchedulerControl.getMock(); @@ -236,6 +248,14 @@ public class AdministrationServiceImplTest managedRepositoryAdmin.setRepositorySessionFactory( repositorySessionFactory ); managedRepositoryAdmin.setAuditListeners( Arrays.asList( auditListener ) ); managedRepositoryAdmin.setRoleManager( roleManager ); + managedRepositoryAdmin.setMavenIndexerUtils( mavenIndexerUtils ); + managedRepositoryAdmin.setPlexusSisuBridge( plexusSisuBridge ); + archivaConfigControl.reset(); + archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 3 ); + configControl.expectAndReturn( config.getManagedRepositories(), new ArrayList( 0 ) ); + archivaConfigControl.replay(); + configControl.replay(); + managedRepositoryAdmin.initialize(); RepositoryCommonValidator repositoryCommonValidator = new RepositoryCommonValidator(); repositoryCommonValidator.setArchivaConfiguration( archivaConfig ); @@ -266,6 +286,18 @@ public class AdministrationServiceImplTest Collections.singletonList( listener ), repositoryStatisticsManager, repositoryMerger, auditListener, managedRepositoryAdmin, remoteRepositoryAdmin, proxyConnectorAdmin, repositoryGroupAdmin ); + + + } + + @After + public void shutdown() + throws Exception + { + //archivaConfigControl.reset(); + //archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1 ); + //configControl.expectAndReturn( config.getManagedRepositories(), new ArrayList( 0 ), 1 ); + //managedRepositoryAdmin.shutdown(); } /* Tests for repository consumers */ @@ -305,7 +337,9 @@ public class AdministrationServiceImplTest // test enable "check-metadata" consumer recordRepoConsumers(); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getRepositoryScanning(), repoScanning, 1, 5 ); archivaConfig.save( config ); @@ -406,7 +440,9 @@ public class AdministrationServiceImplTest { ManagedRepositoryConfiguration managedRepo = createManagedRepo( "default", "default-repo" ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( managedRepo ), 1, 5 ); ManagedDefaultRepositoryContent repoContent = new ManagedDefaultRepositoryContent(); @@ -458,8 +494,9 @@ public class AdministrationServiceImplTest PathParser parser = (PathParser) pathParserControl.getMock(); ManagedRepositoryConfiguration managedRepo = createManagedRepo( "legacy", "legacy-repo" ); - + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( managedRepo ), 1, 5 ); ManagedLegacyRepositoryContent repoContent = new ManagedLegacyRepositoryContent(); @@ -520,7 +557,9 @@ public class AdministrationServiceImplTest { ManagedRepositoryConfiguration managedRepo = createManagedRepo( "default", "default-repo" ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( managedRepo ), 1, 5 ); ManagedDefaultRepositoryContent repoContent = new ManagedDefaultRepositoryContent(); @@ -569,7 +608,9 @@ public class AdministrationServiceImplTest public void testDeleteArtifacRepositoryDoesNotExist() throws Exception { + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Collections.emptyList() ); archivaConfigControl.replay(); @@ -594,7 +635,9 @@ public class AdministrationServiceImplTest public void testExecuteRepoScannerRepoExistsAndNotBeingScanned() throws Exception { + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( createManagedRepo( "internal", "default", "Internal Repository", true, false ) ), 1, 5 ); @@ -630,8 +673,10 @@ public class AdministrationServiceImplTest public void testExecuteRepoScannerRepoExistsButBeingScanned() throws Exception { + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( createManagedRepo( "internal", "default", "Internal Repository", true, false ) ), 1, 5 ); @@ -661,7 +706,9 @@ public class AdministrationServiceImplTest public void testExecuteRepoScannerRepoDoesNotExist() throws Exception { + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Collections.emptyList(), 1, 5 ); archivaConfigControl.replay(); @@ -690,7 +737,9 @@ public class AdministrationServiceImplTest managedRepos.add( createManagedRepo( "internal", "default", "Internal Repository", true, false ) ); managedRepos.add( createManagedRepo( "snapshots", "default", "Snapshots Repository", false, true ) ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), managedRepos ); archivaConfigControl.replay(); @@ -718,7 +767,9 @@ public class AdministrationServiceImplTest remoteRepos.add( createRemoteRepository( "dummy", "Dummy Remote Repository", "legacy", "http://dummy.com/dummy" ) ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getRemoteRepositories(), remoteRepos ); archivaConfigControl.replay(); @@ -739,7 +790,9 @@ public class AdministrationServiceImplTest @Test public void testDeleteInvalidRepositoryContent() { + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Collections.emptyList(), 1, 5 ); archivaConfigControl.replay(); @@ -765,7 +818,9 @@ public class AdministrationServiceImplTest ManagedRepositoryConfiguration managedRepo = createManagedRepo( "default", "default-repo" ); assertTrue( new File( managedRepo.getLocation(), "org" ).exists() ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 3 ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( managedRepo ), 1, 5 ); metadataRepository.removeRepository( "internal" ); @@ -789,7 +844,9 @@ public class AdministrationServiceImplTest public void testMergeRepositoryWithInvalidRepository() throws Exception { + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Collections.emptyList(), 1, 2 ); archivaConfigControl.replay(); @@ -812,8 +869,10 @@ public class AdministrationServiceImplTest public void testMergeWithNoStagingRepository() throws Exception { + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 5 ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( createManagedRepo( "repo", "default", "repo", true, false ) ), 1, 4 ); @@ -853,7 +912,9 @@ public class AdministrationServiceImplTest RepositoryTask task = new RepositoryTask(); task.setScanAll( true ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 5 ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( merge, staging ), 1, 5 ); metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( staging.getId() ), sources ); @@ -921,7 +982,9 @@ public class AdministrationServiceImplTest repo.setLocation( "target/test-repository/one" ); ManagedRepositoryConfiguration staging = createStagingRepo( repo ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositories(), Arrays.asList( repo, staging ), 1, 5 ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 5 ); metadataRepositoryControl.expectAndReturn( metadataRepository.getArtifacts( staging.getId() ), sources ); @@ -984,8 +1047,10 @@ public class AdministrationServiceImplTest remoteRepoMap.put( "repo1", remoteRepo ); repoGroupMap.put( "repo1", repoGroup ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositoriesAsMap(), managedRepoMap ); configControl.expectAndReturn( config.getRemoteRepositoriesAsMap(), remoteRepoMap ); configControl.expectAndReturn( config.getRepositoryGroupsAsMap(), repoGroupMap ); @@ -1051,7 +1116,7 @@ public class AdministrationServiceImplTest assertFalse( new File( releaseLocation ).isDirectory() ); assertFalse( new File( stageLocation ).isDirectory() ); boolean success = service.addManagedRepository( repoId, layout, name, - "${appserver.base}/test-repository/" + projId + ".releases", + appserverBase + "/test-repository/" + projId + ".releases", true, true, false, true, "0 15 3 * * ? *", 1, 1, true ); assertTrue( success ); assertTrue( new File( releaseLocation ).isDirectory() ); @@ -1085,8 +1150,10 @@ public class AdministrationServiceImplTest remoteRepoMap.put( "repo1", remoteRepo ); repoGroupMap.put( "repo1", repoGroup ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositoriesAsMap(), managedRepoMap ); configControl.expectAndReturn( config.getRemoteRepositoriesAsMap(), remoteRepoMap ); configControl.expectAndReturn( config.getRepositoryGroupsAsMap(), repoGroupMap ); @@ -1097,7 +1164,7 @@ public class AdministrationServiceImplTest try { service.addManagedRepository( repoId, layout, name, - "${appserver.base}/test-repository/" + projId + ".releases", true, true, + "target/test-repository/" + projId + ".releases", true, true, false, true, "0 15 3 * * ? *", 1, 1, true ); fail( "An exception should have been thrown! Repository ID is not valid." ); } @@ -1132,8 +1199,10 @@ public class AdministrationServiceImplTest remoteRepoMap.put( "repo1", remoteRepo ); repoGroupMap.put( "repo1", repoGroup ); + archivaConfigControl.reset(); archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + configControl.reset(); configControl.expectAndReturn( config.getManagedRepositoriesAsMap(), managedRepoMap ); configControl.expectAndReturn( config.getRemoteRepositoriesAsMap(), remoteRepoMap ); configControl.expectAndReturn( config.getRepositoryGroupsAsMap(), repoGroupMap ); @@ -1144,7 +1213,7 @@ public class AdministrationServiceImplTest try { service.addManagedRepository( repoId, layout, name, - "${appserver.base}/test-repository/" + projId + ".releases", true, true, + "target/test-repository/" + projId + ".releases", true, true, false, true, "0 15 3 * * ? *", 1, 1, true ); fail( "An exception should have been thrown! Repository name is not valid." ); } @@ -1181,11 +1250,12 @@ public class AdministrationServiceImplTest remoteRepoMap.put( "repo1", remoteRepo ); repoGroupMap.put( "repo1", repoGroup ); - archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); - archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config ); + archivaConfigControl.reset(); + archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1, 3 ); - configControl.expectAndReturn( config.getManagedRepositoriesAsMap(), managedRepoMap ); - configControl.expectAndReturn( config.getRemoteRepositoriesAsMap(), remoteRepoMap ); + configControl.reset(); + configControl.expectAndReturn( config.getManagedRepositoriesAsMap(), managedRepoMap, 0, 3 ); + configControl.expectAndReturn( config.getRemoteRepositoriesAsMap(), remoteRepoMap, 1, 3 ); configControl.expectAndReturn( config.getRepositoryGroupsAsMap(), repoGroupMap ); registryControl.expectAndReturn( registry.getString( "appserver.base", "${appserver.base}" ), appserverBase ); registryControl.expectAndReturn( registry.getString( "appserver.home", "${appserver.home}" ), appserverBase ); diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/META-INF/redback/redback-core.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/META-INF/redback/redback-core.xml new file mode 100644 index 000000000..751ac5c8e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/META-INF/redback/redback-core.xml @@ -0,0 +1,247 @@ + + + + 1.0.0 + + + System + Roles that apply system-wide, across all of the applications + 1.0.0 + + + global + * + true + global resource implies full access for authorization + + + username + ${username} + true + replaced with the username of the principal at authorization check time + + + + + configuration-edit + configuration-edit + edit configuration + true + + + user-management-user-create + user-management-user-create + create user + true + + + user-management-user-edit + user-management-user-edit + edit user + true + + + user-management-user-role + user-management-user-role + user roles + true + + + user-management-user-delete + user-management-user-delete + delete user + true + + + user-management-user-list + user-management-user-list + list users + true + + + user-management-role-grant + user-management-role-grant + grant role + true + + + user-management-role-drop + user-management-role-drop + drop role + true + + + user-management-rbac-admin + user-management-rbac-admin + administer rbac + true + + + guest-access + guest-access + access guest + true + + + user-management-manage-data + user-management-manage-data + manage data + true + + + + + system-administrator + System Administrator + true + true + + + edit-redback-configuration + Edit Redback Configuration + configuration-edit + global + true + + + manage-rbac-setup + User RBAC Management + user-management-rbac-admin + global + true + + + manage-rbac-data + RBAC Manage Data + user-management-manage-data + global + true + + + + user-administrator + + + + user-administrator + User Administrator + true + true + + + drop-roles-for-anyone + Drop Roles for Anyone + user-management-role-drop + global + true + + + grant-roles-for-anyone + Grant Roles for Anyone + user-management-role-grant + global + true + + + user-create + Create Users + user-management-user-create + global + true + + + user-delete + Delete Users + user-management-user-delete + global + true + + + user-edit + Edit Users + user-management-user-edit + global + true + + + access-users-roles + Access Users Roles + user-management-user-role + global + true + + + access-user-list + Access User List + user-management-user-list + global + true + + + + + edit-users-list + edit users list + true + true + + + access-user-list + Access User List + user-management-user-list + global + true + + + + + registered-user + Registered User + true + true + + + edit-user-by-username + Edit User Data by Username + user-management-user-edit + username + true + + + + + guest + Guest + true + true + + + guest-permission + Guest Permission + guest-access + global + true + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/spring-context.xml index 86208a3b0..4a73047ac 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/spring-context.xml @@ -27,4 +27,25 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd" default-lazy-init="true"> + + + + + + + + + + + + + scheduler1 + org.quartz.simpl.SimpleThreadPool + 2 + 4 + org.quartz.simpl.RAMJobStore + + + + \ No newline at end of file