Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory
james.mmbase.org:/tmp/cvs-serv10025/community/src/java/com/finalist/cmsc/services/community/security
Modified Files:
Authentication.java AuthenticationService.java
AuthorityService.java AuthenticationHibernateService.java
AuthorityHibernateService.java
Log Message:
CMSC-617 Personal Pages module
Synced branch 1.4 fixes to head
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-617
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Authentication.java 29 Jan 2008 09:59:40 -0000 1.2
+++ Authentication.java 31 Mar 2008 19:49:01 -0000 1.3
@@ -33,10 +33,16 @@
private static final long serialVersionUID = 1L;
+ /** Authentication id
+ *
+ */
@Id
@GeneratedValue
private Long id;
+ /** account used for login
+ *
+ */
@Column(unique = true)
private String userId;
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AuthenticationService.java 8 Feb 2008 15:16:34 -0000 1.4
+++ AuthenticationService.java 31 Mar 2008 19:49:01 -0000 1.5
@@ -22,7 +22,7 @@
* @param userId
* @param password
*/
- void createAuthentication(String userId, String password);
+ Authentication createAuthentication(String userId, String password);
/**
* Update the login information for the authentication (typically called
by the user)
@@ -46,9 +46,9 @@
* Delete an authentication entry
* TODO if a authentication is deleted, what should happen with the user's
content (in other systems)?
*
- * @param userId
+ * @param id
*/
- void deleteAuthentication(String userId);
+ void deleteAuthentication(Long id);
/**
* Check if the given authentication exists
@@ -126,4 +126,11 @@
* @return authenticationId
*/
Long getAuthenticationIdForUserId(String userId);
+
+ /**
+ * Find authentication information by Id for a user
+ * @param authenticationId
+ * @return Authentication
+ */
+ Authentication getAuthenticationById(Long authenticationId);
}
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AuthorityService.java 29 Jan 2008 09:59:40 -0000 1.2
+++ AuthorityService.java 31 Mar 2008 19:49:01 -0000 1.3
@@ -35,7 +35,7 @@
* @param parentName
* @param authorityName
*/
- void createAuthority(String parentName, String authorityName);
+ Authority createAuthority(String parentName, String authorityName);
/**
* Delete an Authority
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AuthenticationHibernateService.java 21 Feb 2008 12:47:23 -0000 1.6
+++ AuthenticationHibernateService.java 31 Mar 2008 19:49:01 -0000 1.7
@@ -29,12 +29,15 @@
/** [EMAIL PROTECTED] */
@Transactional
- public void createAuthentication(String userId, String password) {
+ public Authentication createAuthentication(String userId, String password) {
Authentication authentication = new Authentication();
authentication.setUserId(userId);
authentication.setPassword(encodePassword(password, userId));
authentication.setEnabled(true);
- getSession().save(authentication);
+ Long id = (Long) getSession().save(authentication);
+ getSession().flush();
+ authentication.setId(id);
+ return authentication;
}
/** [EMAIL PROTECTED] */
@@ -57,8 +60,8 @@
/** [EMAIL PROTECTED] */
@Transactional
- public void deleteAuthentication(String userId) {
- Authentication authentication =
findAuthenticationByUserId(userId);
+ public void deleteAuthentication(Long id) {
+ Authentication authentication = getAuthenticationById(id);
getSession().delete(authentication);
}
@@ -151,8 +154,7 @@
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
public List<Authentication> findAuthenticationsForAuthority(String
name) {
- Criteria criteria =
getSession().createCriteria(Authentication.class).createCriteria("authorities").add(
- Restrictions.eq("name", name));
+ Criteria criteria =
getSession().createCriteria(Authentication.class).createCriteria("authorities").add(Restrictions.eq("name",
name));
return findAuthenticationListByCriteria(criteria);
}
@@ -171,4 +173,10 @@
public void setAuthorityService(AuthorityService authorityService) {
this.authorityService = authorityService;
}
+
+ /** [EMAIL PROTECTED] */
+ @Transactional(readOnly = true)
+ public Authentication getAuthenticationById(Long authenticationId) {
+ return (Authentication) getSession().get(Authentication.class,
authenticationId);
+ }
}
Index: AuthorityHibernateService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthorityHibernateService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AuthorityHibernateService.java 29 Jan 2008 09:59:40 -0000 1.2
+++ AuthorityHibernateService.java 31 Mar 2008 19:49:01 -0000 1.3
@@ -30,10 +30,11 @@
/** [EMAIL PROTECTED] */
@Transactional
- public void createAuthority(String parentName, String name) {
+ public Authority createAuthority(String parentName, String name) {
Authority authority = new Authority();
authority.setName(name);
getSession().save(authority);
+ return authority;
}
/** [EMAIL PROTECTED] */
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
