[Escapek-commits] SF.net SVN: escapek: [813] org.escapek.server/trunk

[<nic...@us...>]

Revision: 813
          http://svn.sourceforge.net/escapek/?rev=813&view=rev
Author:   nicolasjouanin
Date:     2007-02-15 12:42:53 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
add getRoleHeritedTole() method.

Modified Paths:
--------------
    org.escapek.server/trunk/META-INF/MANIFEST.MF
    org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java
    org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java
    org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java

Modified: org.escapek.server/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.server/trunk/META-INF/MANIFEST.MF	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/META-INF/MANIFEST.MF	2007-02-15 20:42:53 UTC (rev 813)
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.escapek.server;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.escapek.server.ServerPlugin
-Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.navigator,
  org.eclipse.core.runtime
 Eclipse-LazyStart: true

Modified: org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java
===================================================================
--- org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java	2007-02-15 20:42:53 UTC (rev 813)
@@ -57,7 +57,7 @@
 	private String description;
 	private Collection<User> grantedUsers;
 	private Collection<RolePrivilege> grantedPrivileges;
-	private Collection<Role> grantedRoles;
+	private Collection<Role> inheritedRoles;
 	
 	public Role()
 	{
@@ -108,13 +108,13 @@
 	 */
 	@ManyToMany(
         cascade={CascadeType.PERSIST, CascadeType.MERGE},
-        mappedBy="grantedRoles",
+        mappedBy="inheritedRoles",
         targetEntity=User.class
     )
     public Collection<User> getGrantedUsers() { return grantedUsers; }
 	/**
 	 * @param grantedUsers  the grantedUsers to set
-	 * @uml.property  name="grantedRoles"
+	 * @uml.property  name="inheritedRoles"
 	 */
 	public void setGrantedUsers(Collection<User> users) { this.grantedUsers = users; }
 	
@@ -159,11 +159,11 @@
         joinColumns={@JoinColumn(name="ROLE_FK")},
         inverseJoinColumns={@JoinColumn(name="GRANTED_ROLE_FK")}
     )
-	public Collection<Role> getGrantedRoles() {
-		return grantedRoles;
+	public Collection<Role> getInheritedRoles() {
+		return inheritedRoles;
 	}
 
-	public void setGrantedRoles(Collection<Role> grantedRoles) {
-		this.grantedRoles = grantedRoles;
+	public void setInheritedRoles(Collection<Role> grantedRoles) {
+		this.inheritedRoles = grantedRoles;
 	}
 }

Modified: org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java
===================================================================
--- org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java	2007-02-15 20:42:53 UTC (rev 813)
@@ -375,8 +375,8 @@
 				return true;
 		}
 				
-		//Checking is one of the granted role is granted the checkedPrivilege
-		for(Role role : aRole.getGrantedRoles())
+		//Checking is one of the inherited role is granted the checkedPrivilege
+		for(Role role : aRole.getInheritedRoles())
 		{
 			log.debug(
 					"\tChecking " + checkedPrivilege.toString() + " privilege for granted role "+aRole.getName());
@@ -691,7 +691,7 @@
 		{
 			throw new EntityNotFoundException(Role.class.getName(), role);
 		}
-		role.getGrantedRoles().add(grantedRole);
+		role.getInheritedRoles().add(grantedRole);
 	}
 
 	public RolePrivilegeDTO grantRolePrivilege(Long ticketId, Long roleId, Privilege privilege)
@@ -803,4 +803,11 @@
 		Collection<User> users = getRole(roleId).getGrantedUsers();
 		return userAssembler.convertModelCollection(users);
 	}
+	
+	public Collection<RoleDTO> getInheritedRoles(Long ticketId, Long roleId) throws SecurityException
+	{
+		checkTicket(ticketId);
+		Collection<Role> inheritedRoles = getRole(roleId).getInheritedRoles();
+		return roleAssembler.convertModelCollection(inheritedRoles);
+	}
 }

Modified: org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java
===================================================================
--- org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java	2007-02-15 20:42:53 UTC (rev 813)
@@ -138,4 +138,5 @@
 	 */
 	public Collection<RolePrivilegeDTO> getRoleGrantedPrivileges(Long ticketId, Long roleId) throws SecurityException;
 	public Collection<UserDTO> getRoleGrantedUsers(Long ticketId, Long roleId) throws SecurityException;
+	public Collection<RoleDTO> getInheritedRoles(Long ticketId, Long roleId) throws SecurityException;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.