package move to o.a.a.r module redback-integrations-security

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311026 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java
index ce9a5ee6c0796dc7c889d6f8cdbfb44a4db8d1ec..fe154d27a8adfacaeba1de90f20d09e1371e5b71 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration.role;
  * under the License.
  */
 
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 
 /**
  * RoleConstants:

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
new file mode 100644 (file)
index 0000000..b7241b9
--- /dev/null
+++ b/redback-integrations/redback-integrations-security/src/main/java/org/apache/archiva/redback/integration/security/role/RedbackRoleConstants.java
@@ -0,0 +1,72 @@
+package org.apache.archiva.redback.integration.security.role;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Inteface with role constants
+ * @author Olivier Lamy
+ * @since 1.3
+ *
+ */
+public interface RedbackRoleConstants
+{
+    public static final String ADMINISTRATOR_ACCOUNT_NAME = "admin";
+
+    // roles
+    public static final String SYSTEM_ADMINISTRATOR_ROLE = "System Administrator";
+
+    public static final String USER_ADMINISTRATOR_ROLE = "User Administrator";
+
+    public static final String REGISTERED_USER_ROLE = "Registered User";
+
+    /**
+     * @since 1.4
+     */
+    public static final String REGISTERED_USER_ROLE_ID = "registered-user";
+
+    public static final String GUEST_ROLE = "Guest";
+
+    // guest access operation
+    public static final String GUEST_ACCESS_OPERATION = "guest-access";
+
+    // operations against configuration
+    public static final String CONFIGURATION_EDIT_OPERATION = "configuration-edit";
+
+    // operations against user
+    public static final String USER_MANAGEMENT_USER_CREATE_OPERATION = "user-management-user-create";
+
+    public static final String USER_MANAGEMENT_USER_EDIT_OPERATION = "user-management-user-edit";
+
+    public static final String USER_MANAGEMENT_USER_ROLE_OPERATION = "user-management-user-role";
+
+    public static final String USER_MANAGEMENT_USER_DELETE_OPERATION = "user-management-user-delete";
+
+    public static final String USER_MANAGEMENT_USER_LIST_OPERATION = "user-management-user-list";
+
+    // operations against user assignment.
+    public static final String USER_MANAGEMENT_ROLE_GRANT_OPERATION = "user-management-role-grant";
+
+    public static final String USER_MANAGEMENT_ROLE_DROP_OPERATION = "user-management-role-drop";
+
+    // operations against rbac objects.
+    public static final String USER_MANAGEMENT_RBAC_ADMIN_OPERATION = "user-management-rbac-admin";
+
+    public static final String USER_MANAGEMENT_MANAGE_DATA = "user-management-manage-data";
+}

diff --git a/redback-integrations/redback-integrations-security/src/main/java/org/codehaus/redback/integration/security/role/RedbackRoleConstants.java b/redback-integrations/redback-integrations-security/src/main/java/org/codehaus/redback/integration/security/role/RedbackRoleConstants.java
deleted file mode 100644 (file)
index 12842bd..0000000
--- a/redback-integrations/redback-integrations-security/src/main/java/org/codehaus/redback/integration/security/role/RedbackRoleConstants.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.codehaus.redback.integration.security.role;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Inteface with role constants
- * @author Olivier Lamy
- * @since 1.3
- *
- */
-public interface RedbackRoleConstants
-{
-    public static final String ADMINISTRATOR_ACCOUNT_NAME = "admin";
-
-    // roles
-    public static final String SYSTEM_ADMINISTRATOR_ROLE = "System Administrator";
-
-    public static final String USER_ADMINISTRATOR_ROLE = "User Administrator";
-
-    public static final String REGISTERED_USER_ROLE = "Registered User";
-
-    /**
-     * @since 1.4
-     */
-    public static final String REGISTERED_USER_ROLE_ID = "registered-user";
-
-    public static final String GUEST_ROLE = "Guest";
-
-    // guest access operation
-    public static final String GUEST_ACCESS_OPERATION = "guest-access";
-
-    // operations against configuration
-    public static final String CONFIGURATION_EDIT_OPERATION = "configuration-edit";
-
-    // operations against user
-    public static final String USER_MANAGEMENT_USER_CREATE_OPERATION = "user-management-user-create";
-
-    public static final String USER_MANAGEMENT_USER_EDIT_OPERATION = "user-management-user-edit";
-
-    public static final String USER_MANAGEMENT_USER_ROLE_OPERATION = "user-management-user-role";
-
-    public static final String USER_MANAGEMENT_USER_DELETE_OPERATION = "user-management-user-delete";
-
-    public static final String USER_MANAGEMENT_USER_LIST_OPERATION = "user-management-user-list";
-
-    // operations against user assignment.
-    public static final String USER_MANAGEMENT_ROLE_GRANT_OPERATION = "user-management-role-grant";
-
-    public static final String USER_MANAGEMENT_ROLE_DROP_OPERATION = "user-management-role-drop";
-
-    // operations against rbac objects.
-    public static final String USER_MANAGEMENT_RBAC_ADMIN_OPERATION = "user-management-rbac-admin";
-
-    public static final String USER_MANAGEMENT_MANAGE_DATA = "user-management-manage-data";
-}

diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java
index 4e181dd62a0fbea92b2600c61d8b4a9fa240bb7d..4a9c5471f78c071df3e984b676f1cff4185b14c7 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java
@@ -19,7 +19,7 @@ package org.codehaus.redback.rest.api.services;
  */
 
 import org.apache.archiva.redback.authorization.RedbackAuthorization;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.api.model.Application;
 import org.codehaus.redback.rest.api.model.ApplicationRoles;
 import org.codehaus.redback.rest.api.model.Role;

diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java
index 872c307a7efd1e334b63e294993e8b9a3ff96358..b05768f201f6faf8223fb8c29ead7e43e64e969e 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java
@@ -20,7 +20,7 @@ package org.codehaus.redback.rest.api.services;
  */
 
 import org.apache.archiva.redback.authorization.RedbackAuthorization;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.api.model.Operation;
 import org.codehaus.redback.rest.api.model.Permission;
 import org.codehaus.redback.rest.api.model.RegistrationKey;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
index 581dc47f888605ef7413d2c02521b90916fc2c39..26c7d1388fe7f1cf8f3409332e7e69aad81f69f1 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
@@ -33,7 +33,7 @@ import org.codehaus.plexus.redback.role.model.ModelApplication;
 import org.codehaus.plexus.redback.role.model.ModelRole;
 import org.codehaus.plexus.redback.role.model.ModelTemplate;
 import org.codehaus.redback.integration.model.AdminEditUserCredentials;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.integration.util.RoleSorter;
 import org.codehaus.redback.rest.api.model.Application;
 import org.codehaus.redback.rest.api.model.ApplicationRoles;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
index ff0f8f84e697e3d3136272f55553873cff2e88e6..5c7b0660502f75fd2eda3693d969c602998f375e 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
@@ -44,7 +44,7 @@ import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
 import org.codehaus.redback.integration.mail.Mailer;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.api.model.ErrorMessage;
 import org.codehaus.redback.rest.api.model.Operation;
 import org.codehaus.redback.rest.api.model.Permission;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java
index b4862d574110dd1773b99c466a4f9385a19dcabc..ce203475905eadee1ed2401eea878d23b835d3c2 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java
@@ -26,7 +26,7 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.transport.servlet.CXFServlet;
 import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.api.model.User;
 import org.codehaus.redback.rest.api.services.LoginService;
 import org.codehaus.redback.rest.api.services.RoleManagementService;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java
index a8dbece3bde501450450b2f47026682a61350454..436475743d694794e2d3d4e8452bf0ef5ef07a70 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java
@@ -18,7 +18,7 @@ package org.codehaus.redback.rest.services;
  * under the License.
  */
 
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.api.model.User;
 import org.codehaus.redback.rest.api.services.UserService;
 import org.junit.Test;

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
index 1333aeff707f3cde9813aee8c21ae3ed78a1a3b2..6b024075aa270a0a418b6771a6cfa64112322532 100644 (file)
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
@@ -29,7 +29,7 @@ import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.redback.integration.model.UserCredentials;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.integration.util.RoleSorter;
 
 import javax.inject.Inject;

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
index dc27c0708387e46fd5b65ba3d08e1cea5927e71d..d721b64f9496f43e7f9d85b8d5a53198c38d9acc 100644 (file)
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
@@ -31,7 +31,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
 import org.codehaus.redback.integration.mail.Mailer;
 import org.codehaus.redback.integration.model.CreateUserCredentials;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
index d1d81bfb100151ac70d28fb6807c84b2c0207a04..409d703981a5346ad5c42896f627fd2331fc4a51 100644 (file)
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
@@ -33,7 +33,7 @@ import org.apache.archiva.redback.users.UserNotFoundException;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
-import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
+import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;