svn commit: r1821872 - in /turbine/core/trunk/src/java/org/apache/turbine/services/security: DefaultSecurityService.java SecurityService.java

[gk]

Author: gk
Date: Mon Jan 22 14:35:04 2018
New Revision: 1821872

URL: http://svn.apache.org/viewvc?rev=1821872&view=rev
Log:
- map fulcrum model replace with replaceRole in turbine model

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java?rev=1821872&r1=1821871&r2=1821872&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
 Mon Jan 22 14:35:04 2018
@@ -851,6 +851,23 @@ public class DefaultSecurityService
         }
         modelManager.revoke(user.getUserDelegate(), group, role);
     }
+    
+    /**
+     * Replaces transactionally the first role with second role for the given 
user. 
+     * 
+     * @param user the user.
+     * @param role the old role
+     * @param newRole the new role
+     * 
+     * @throws DataBackendException
+     * @throws UnknownEntityException
+     */
+    @Override
+    public void replaceRole(User user, Role role, Role newRole)
+                    throws DataBackendException, UnknownEntityException
+    {
+        modelManager.replace( user, role, newRole );
+    }
 
     /**
      * Revokes all roles from an User.

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java?rev=1821872&r1=1821871&r2=1821872&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
 Mon Jan 22 14:35:04 2018
@@ -713,5 +713,17 @@ public interface SecurityService
      */
     void renamePermission(Permission permission, String name)
             throws DataBackendException, UnknownEntityException;
+    /**
+     * Replaces transactionally the first given role with the second role for 
the given user. 
+     * 
+     * @param user the user.
+     * @param role the old role
+     * @param newRole the new role
+     * 
+     * @throws DataBackendException
+     * @throws UnknownEntityException
+     */
+    void replaceRole( User user, Role role, Role newRole )
+        throws DataBackendException, UnknownEntityException;
 
 }