diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2010-10-01 03:50:04 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2010-10-01 03:50:04 +0000 |
| commit | d35e740ca9af5352e77788e3929db365c2d1a051 (patch) | |
| tree | 28120559549f51dd113fad881d9a8cc5308b088c /archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security | |
| parent | e82ce0f0b50f2db74e998c02384c8f7cfa1ee4a4 (diff) | |
| download | archiva-d35e740ca9af5352e77788e3929db365c2d1a051.tar.gz archiva-d35e740ca9af5352e77788e3929db365c2d1a051.zip | |
[MRM-1409] web services for repository merge
submitted by Gwen Harold Autencio
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1003378 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java index d194a910d..457ab8b7b 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java @@ -42,7 +42,8 @@ public class ServiceMethodsPermissionsMapping "AdministrationService.getAllRepositoryConsumers", "AdministrationService.deleteArtifact", "AdministrationService.addManagedRepository", - "AdministrationService.deleteManagedRepository", "AdministrationService.getManagedRepository" ); + "AdministrationService.deleteManagedRepository", "AdministrationService.getManagedRepository", + "AdministrationService.merge"); public static final List<String> SERVICE_METHODS_FOR_OPERATION_RUN_INDEXER = Arrays.asList( "AdministrationService.executeRepositoryScanner" ); |