Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory james.mmbase.org:/tmp/cvs-serv18855
Modified Files:
Authentication.java AuthenticationHibernateService.java
AuthenticationService.java Authority.java
AuthorityService.java
Log Message:
CMSC-996,User and Group lists in Editors,add find relation option record
fuction
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
See also: http://www.mmbase.org/jira/browse/CMSC-996
Index: Authentication.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/Authentication.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Authentication.java 15 Jul 2008 04:39:16 -0000 1.4
+++ Authentication.java 27 Jul 2008 07:34:18 -0000 1.5
@@ -13,8 +13,10 @@
import java.util.HashSet;
import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
Index: AuthenticationHibernateService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationHibernateService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- AuthenticationHibernateService.java 24 Jul 2008 09:05:18 -0000 1.10
+++ AuthenticationHibernateService.java 27 Jul 2008 07:34:18 -0000 1.11
@@ -191,5 +191,12 @@
public Authentication createAuthentication(Authentication
authentication) {
return createAuthentication(authentication.getUserId(),
authentication.getPassword());
}
-
+ @Transactional
+ public void removeAuthenticationFromAuthority(String authId, String
groupName) {
+ Long id=Long.decode(authId);
+ Authentication authentication = getAuthenticationById(id);
+ Authority authority =
authorityService.findAuthorityByName(groupName);
+ authentication.removeAuthority(authority);
+ getSession().flush();
+ }
}
Index: AuthenticationService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthenticationService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- AuthenticationService.java 24 Jul 2008 09:33:09 -0000 1.8
+++ AuthenticationService.java 27 Jul 2008 07:34:18 -0000 1.9
@@ -140,4 +140,5 @@
Authentication getAuthenticationById(Long authenticationId);
public Authentication createAuthentication(Authentication
authentication);
+ public void removeAuthenticationFromAuthority(String authId, String
groupName);
}
Index: Authority.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/Authority.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Authority.java 29 Jan 2008 09:59:40 -0000 1.2
+++ Authority.java 27 Jul 2008 07:34:18 -0000 1.3
@@ -13,8 +13,10 @@
import java.util.HashSet;
import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
@@ -38,7 +40,7 @@
@Column(unique = true)
private String name;
- @ManyToMany(mappedBy = "authorities")
+ @ManyToMany(fetch = FetchType.EAGER, mappedBy = "authorities")
private Set<Authentication> authentications = new
HashSet<Authentication>();
@ManyToMany(mappedBy = "authorities")
Index: AuthorityService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthorityService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AuthorityService.java 31 Mar 2008 19:49:01 -0000 1.3
+++ AuthorityService.java 27 Jul 2008 07:34:18 -0000 1.4
@@ -10,8 +10,12 @@
package com.finalist.cmsc.services.community.security;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import com.finalist.cmsc.paging.PagingStatusHolder;
/**
* @author Remco Bos
@@ -22,6 +26,7 @@
* @return set with authorities names
*/
Set<String> getAuthorityNames();
+ List<Authority> getAllAuthorities(PagingStatusHolder holder);
/**
* @param userName
@@ -58,8 +63,14 @@
*/
Authority findAuthorityByName(String authorityName);
-// boolean isAdminAuthority(String authorityName);
-// void addAuthority(String parentName, String childName);
-// void removeAuthority(String parentName, String childName);
+ List<Authority> findAssociatedAuthorityByName(String
name,PagingStatusHolder holder);
+
+ int countAllAuthorities();
+
+ int countAssociatedAuthorities(String name);
+
+ List<Authority> getAssociatedAuthorities(Map map, PagingStatusHolder
holder);
+
+ int getAssociatedAuthoritiesNum(Map map, PagingStatusHolder holder);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
