You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2020/11/04 15:19:25 UTC
[archiva-redback-core] 02/03: Changing permission and operation
name for redback config
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit a280a6fd7f7b453680b51125ace626ee33add396
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Wed Nov 4 15:45:28 2020 +0100
Changing permission and operation name for redback config
---
.../src/main/resources/META-INF/redback/redback-core.xml | 6 +++---
.../redback/integration/security/role/RedbackRoleConstants.java | 2 +-
.../src/main/resources/META-INF/redback/redback-core.xml | 6 +++---
.../src/test/processor-tests/redback-2.xml | 6 +++---
.../src/test/validation-tests/redback-core.xml | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/redback-common/redback-common-test-resources/src/main/resources/META-INF/redback/redback-core.xml b/redback-common/redback-common-test-resources/src/main/resources/META-INF/redback/redback-core.xml
index 1088fa0..9f049d2 100644
--- a/redback-common/redback-common-test-resources/src/main/resources/META-INF/redback/redback-core.xml
+++ b/redback-common/redback-common-test-resources/src/main/resources/META-INF/redback/redback-core.xml
@@ -41,8 +41,8 @@
</resources>
<operations>
<operation>
- <id>configuration-edit</id>
- <name>configuration-edit</name>
+ <id>redback-configuration-edit</id>
+ <name>redback-configuration-edit</name>
<description>edit configuration</description>
<permanent>true</permanent>
</operation>
@@ -117,7 +117,7 @@
<permission>
<id>edit-redback-configuration</id>
<name>Edit Redback Configuration</name>
- <operation>configuration-edit</operation>
+ <operation>redback-configuration-edit</operation>
<resource>global</resource>
<permanent>true</permanent>
</permission>
diff --git a/redback-integrations/redback-integrations-security/src/main/java/org/apache/archiva/redback/integration/security/role/RedbackRoleConstants.java b/redback-integrations/redback-integrations-security/src/main/java/org/apache/archiva/redback/integration/security/role/RedbackRoleConstants.java
index d5b47c6..44c9fd2 100644
--- a/redback-integrations/redback-integrations-security/src/main/java/org/apache/archiva/redback/integration/security/role/RedbackRoleConstants.java
+++ b/redback-integrations/redback-integrations-security/src/main/java/org/apache/archiva/redback/integration/security/role/RedbackRoleConstants.java
@@ -47,7 +47,7 @@ public interface RedbackRoleConstants
public static final String GUEST_ACCESS_OPERATION = "guest-access";
// operations against configuration
- public static final String CONFIGURATION_EDIT_OPERATION = "configuration-edit";
+ public static final String CONFIGURATION_EDIT_OPERATION = "redback-configuration-edit";
// operations against user
public static final String USER_MANAGEMENT_USER_CREATE_OPERATION = "user-management-user-create";
diff --git a/redback-integrations/redback-integrations-security/src/main/resources/META-INF/redback/redback-core.xml b/redback-integrations/redback-integrations-security/src/main/resources/META-INF/redback/redback-core.xml
index 2eddf19..bfc1ba7 100644
--- a/redback-integrations/redback-integrations-security/src/main/resources/META-INF/redback/redback-core.xml
+++ b/redback-integrations/redback-integrations-security/src/main/resources/META-INF/redback/redback-core.xml
@@ -41,8 +41,8 @@
</resources>
<operations>
<operation>
- <id>configuration-edit</id>
- <name>configuration-edit</name>
+ <id>redback-configuration-edit</id>
+ <name>redback-configuration-edit</name>
<description>edit configuration</description>
<permanent>true</permanent>
</operation>
@@ -123,7 +123,7 @@
<permission>
<id>edit-redback-configuration</id>
<name>Edit Redback Configuration</name>
- <operation>configuration-edit</operation>
+ <operation>redback-configuration-edit</operation>
<resource>global</resource>
<permanent>true</permanent>
</permission>
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/processor-tests/redback-2.xml b/redback-rbac/redback-rbac-role-manager/src/test/processor-tests/redback-2.xml
index def4600..a01901c 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/processor-tests/redback-2.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/processor-tests/redback-2.xml
@@ -46,8 +46,8 @@
</resources>
<operations>
<operation>
- <id>configuration-edit</id>
- <name>configuration-edit</name>
+ <id>redback-configuration-edit</id>
+ <name>redback-configuration-edit</name>
<description>edit configuration</description>
<permanent>true</permanent>
</operation>
@@ -116,7 +116,7 @@
<permission>
<id>edit-redback-configuration</id>
<name>Edit Redback Configuration</name>
- <operation>configuration-edit</operation>
+ <operation>redback-configuration-edit</operation>
<resource>global</resource>
<permanent>true</permanent>
</permission>
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/validation-tests/redback-core.xml b/redback-rbac/redback-rbac-role-manager/src/test/validation-tests/redback-core.xml
index dc139e1..2133dbc 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/validation-tests/redback-core.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/validation-tests/redback-core.xml
@@ -46,8 +46,8 @@
</resources>
<operations>
<operation>
- <id>configuration-edit</id>
- <name>configuration-edit</name>
+ <id>redback-configuration-edit</id>
+ <name>redback-configuration-edit</name>
<description>edit configuration</description>
<permanent>true</permanent>
</operation>
@@ -116,7 +116,7 @@
<permission>
<id>edit-redback-configuration</id>
<name>Edit Redback Configuration</name>
- <operation>configuration-edit</operation>
+ <operation>redback-configuration-edit</operation>
<resource>global</resource>
<permanent>true</permanent>
</permission>