aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-security/src/main
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2011-06-29 08:41:07 +0000
committerBrett Porter <brett@apache.org>2011-06-29 08:41:07 +0000
commit31e93bb1c9b6bde9403ddb5c9a541fc9608b7169 (patch)
tree94afdd5edeeb68c0cef23ce185b5d05cddb65373 /archiva-modules/archiva-web/archiva-security/src/main
parent506b6613edf555c75a776d779def31ec567a94e1 (diff)
downloadarchiva-31e93bb1c9b6bde9403ddb5c9a541fc9608b7169.tar.gz
archiva-31e93bb1c9b6bde9403ddb5c9a541fc9608b7169.zip
some low hanging fruit in the quest to improve the staging repository implementation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1141002 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-security/src/main')
-rw-r--r--archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml b/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
index ee57e70fd..3bb9ba48d 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
@@ -25,6 +25,11 @@
<name>archiva-run-indexer</name>
<description>Run Archiva Indexer</description>
</operation>
+ <operation>
+ <id>archiva-merge-stage</id>
+ <name>archiva-merge-stage</name>
+ <description>Merge Stage Repository</description>
+ </operation>
<operation>
<id>archiva-delete-artifact</id>
<name>archiva-delete-artifact</name>
@@ -252,6 +257,12 @@
<operation>archiva-delete-metadata</operation>
<resource>${resource}</resource>
</permission>
+ <permission>
+ <id>archiva-merge-repository</id>
+ <name>Archiva Merge Repository</name>
+ <operation>archiva-merge-repository</operation>
+ <resource>${resource}</resource>
+ </permission>
</permissions>
<childTemplates>
<childTemplate>archiva-repository-observer</childTemplate>