[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv8582/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- PersonHibernateService.java 3 Mar 2009 08:56:27 - 1.28
+++ PersonHibernateService.java 3 Mar 2009 09:06:15 - 1.29
@@ -503,7 +503,7 @@
return criteria.list();
}
@Transactional
- public void ImportDataFromFileRecord(String level,
+ public void importDataFromFileRecord(String level,
PersonExportImportVO importPerson) {
Person p =
getPersonByUserId(importPerson.getAuthentication().getUserId());
if (over.equals(level)) {
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- PersonService.java 3 Mar 2009 06:23:55 - 1.20
+++ PersonService.java 3 Mar 2009 09:06:15 - 1.21
@@ -89,5 +89,5 @@
public ListAuthority getAllAuthorities();
- public void ImportDataFromFileRecord(String level, PersonExportImportVO
importPerson);
+ public void importDataFromFileRecord(String level, PersonExportImportVO
importPerson);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv8718/services/community/person
Modified Files:
Tag: b1_5
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.23.2.5
retrieving revision 1.23.2.6
diff -u -b -r1.23.2.5 -r1.23.2.6
--- PersonHibernateService.java 3 Mar 2009 08:57:36 - 1.23.2.5
+++ PersonHibernateService.java 3 Mar 2009 09:08:13 - 1.23.2.6
@@ -503,7 +503,7 @@
return criteria.list();
}
@Transactional
- public void ImportDataFromFileRecord(String level,
+ public void importDataFromFileRecord(String level,
PersonExportImportVO importPerson) {
Person p =
getPersonByUserId(importPerson.getAuthentication().getUserId());
if (over.equals(level)) {
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -b -r1.16.2.4 -r1.16.2.5
--- PersonService.java 3 Mar 2009 06:29:49 - 1.16.2.4
+++ PersonService.java 3 Mar 2009 09:08:13 - 1.16.2.5
@@ -89,5 +89,5 @@
public ListAuthority getAllAuthorities();
- public void ImportDataFromFileRecord(String level, PersonExportImportVO
importPerson);
+ public void importDataFromFileRecord(String level, PersonExportImportVO
importPerson);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv10856/services/community/person
Modified Files:
Tag: b1_6
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -b -r1.26.2.3 -r1.26.2.4
--- PersonHibernateService.java 3 Mar 2009 09:15:11 - 1.26.2.3
+++ PersonHibernateService.java 3 Mar 2009 10:29:56 - 1.26.2.4
@@ -502,68 +502,4 @@
criteria = criteria.setResultTransformer(criteria.DISTINCT_ROOT_ENTITY);
return criteria.list();
}
- @Transactional
- public void importDataFromFileRecord(String level,
- PersonExportImportVO importPerson) {
- Person p =
getPersonByUserId(importPerson.getAuthentication().getUserId());
- if (over.equals(level)) {
- if(p != null) {
-
authenticationService.updateAuthenticationPassword(importPerson.getAuthentication().getUserId(),
importPerson.getAuthentication().getPassword());
-p.setEmail(importPerson.getEmail());
-p.setActive(importPerson.getActive());
-updatePerson(p);
- }
- else {
-Authentication authentication =
authenticationService.createAuthentication(importPerson.getAuthentication());
-if (authentication.getId() != null) {
- if(importPerson.getAuthorityId()0 ){
- Authority authority =
this.getAuthorityById(importPerson.getAuthorityId());
- if (null!=authentication.getAuthorities()) {
- authentication.getAuthorities().add(authority);
- }
- }
- addPerson(importPerson, authentication);
-}
- }
- }
- else{
- // add new users or put user to another group
- createNewPerson(importPerson);
- }
-
- }
- @Transactional
- private void addPerson(PersonExportImportVO importPerson,
- Authentication authentication) {
- Person person = new Person();
- person.setEmail(importPerson.getEmail());
- person.setActive(importPerson.getActive());
- person.setAuthenticationId(authentication.getId());
- getSession().saveOrUpdate(authentication);
- updatePerson(person);
- }
- @Transactional(propagation = Propagation.REQUIRED)
- private void createNewPerson(PersonExportImportVO xperson) {
-
- Authentication authentication = xperson.getAuthentication();
-
if(authenticationService.authenticationExists(authentication.getUserId())
xperson.getAuthorityId()0 ){
- Authority authority = this.getAuthorityById(xperson.getAuthorityId());
- if(null!=authority){
-authentication =
authenticationService.getAuthenticationById(authenticationService.getAuthenticationIdForUserId(authentication.getUserId()));
-authentication.getAuthorities().add(authority);
-getSession().saveOrUpdate(authentication);
- }
- }
- else
if(!authenticationService.authenticationExists(authentication.getUserId())){
- authentication =
authenticationService.createAuthentication(authentication);
- if(xperson.getAuthorityId()0 ){
-Authority authority =
this.getAuthorityById(xperson.getAuthorityId());
-if (null!=authentication.getAuthorities()) {
- authentication.getAuthorities().add(authority);
-}
- }
- addPerson(xperson, authentication);
- }
-
- }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -b -r1.19.2.2 -r1.19.2.3
--- PersonService.java 3 Mar 2009 09:15:11 - 1.19.2.2
+++ PersonService.java 3 Mar 2009 10:29:56 - 1.19.2.3
@@ -89,5 +89,4 @@
public ListAuthority getAllAuthorities();
- public void importDataFromFileRecord(String level, PersonExportImportVO
importPerson);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv10900/services/community/person
Modified Files:
Tag: b1_5
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -u -b -r1.23.2.6 -r1.23.2.7
--- PersonHibernateService.java 3 Mar 2009 09:08:13 - 1.23.2.6
+++ PersonHibernateService.java 3 Mar 2009 10:30:16 - 1.23.2.7
@@ -502,68 +502,4 @@
criteria = criteria.setResultTransformer(criteria.DISTINCT_ROOT_ENTITY);
return criteria.list();
}
- @Transactional
- public void importDataFromFileRecord(String level,
- PersonExportImportVO importPerson) {
- Person p =
getPersonByUserId(importPerson.getAuthentication().getUserId());
- if (over.equals(level)) {
- if(p != null) {
-
authenticationService.updateAuthenticationPassword(importPerson.getAuthentication().getUserId(),
importPerson.getAuthentication().getPassword());
-p.setEmail(importPerson.getEmail());
-p.setActive(importPerson.getActive());
-updatePerson(p);
- }
- else {
-Authentication authentication =
authenticationService.createAuthentication(importPerson.getAuthentication());
-if (authentication.getId() != null) {
- if(importPerson.getAuthorityId()0 ){
- Authority authority =
this.getAuthorityById(importPerson.getAuthorityId());
- if (null!=authentication.getAuthorities()) {
- authentication.getAuthorities().add(authority);
- }
- }
- addPerson(importPerson, authentication);
-}
- }
- }
- else{
- // add new users or put user to another group
- createNewPerson(importPerson);
- }
-
- }
- @Transactional
- private void addPerson(PersonExportImportVO importPerson,
- Authentication authentication) {
- Person person = new Person();
- person.setEmail(importPerson.getEmail());
- person.setActive(importPerson.getActive());
- person.setAuthenticationId(authentication.getId());
- getSession().saveOrUpdate(authentication);
- updatePerson(person);
- }
- @Transactional(propagation = Propagation.REQUIRED)
- private void createNewPerson(PersonExportImportVO xperson) {
-
- Authentication authentication = xperson.getAuthentication();
-
if(authenticationService.authenticationExists(authentication.getUserId())
xperson.getAuthorityId()0 ){
- Authority authority = this.getAuthorityById(xperson.getAuthorityId());
- if(null!=authority){
-authentication =
authenticationService.getAuthenticationById(authenticationService.getAuthenticationIdForUserId(authentication.getUserId()));
-authentication.getAuthorities().add(authority);
-getSession().saveOrUpdate(authentication);
- }
- }
- else
if(!authenticationService.authenticationExists(authentication.getUserId())){
- authentication =
authenticationService.createAuthentication(authentication);
- if(xperson.getAuthorityId()0 ){
-Authority authority =
this.getAuthorityById(xperson.getAuthorityId());
-if (null!=authentication.getAuthorities()) {
- authentication.getAuthorities().add(authority);
-}
- }
- addPerson(xperson, authentication);
- }
-
- }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -b -r1.16.2.5 -r1.16.2.6
--- PersonService.java 3 Mar 2009 09:08:13 - 1.16.2.5
+++ PersonService.java 3 Mar 2009 10:30:16 - 1.16.2.6
@@ -89,5 +89,4 @@
public ListAuthority getAllAuthorities();
- public void importDataFromFileRecord(String level, PersonExportImportVO
importPerson);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv1498/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- PersonHibernateService.java 23 Feb 2009 09:11:50 - 1.26
+++ PersonHibernateService.java 3 Mar 2009 06:23:55 - 1.27
@@ -502,4 +502,68 @@
criteria = criteria.setResultTransformer(criteria.DISTINCT_ROOT_ENTITY);
return criteria.list();
}
+ @Transactional
+ public void ImportDataFromFileRecord(String level,
+ PersonExportImportVO importPerson) {
+ Person p =
getPersonByUserId(importPerson.getAuthentication().getUserId());
+ if (over.equals(level)) {
+ if(p != null) {
+
authenticationService.updateAuthenticationPassword(importPerson.getAuthentication().getUserId(),
importPerson.getAuthentication().getPassword());
+p.setEmail(importPerson.getEmail());
+p.setActive(importPerson.getActive());
+updatePerson(p);
+ }
+ else {
+Authentication authentication =
authenticationService.createAuthentication(importPerson.getAuthentication());
+if (authentication.getId() != null) {
+ if(importPerson.getAuthorityId()0 ){
+ Authority authority =
this.getAuthorityById(importPerson.getAuthorityId());
+ if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+ }
+ }
+ addPerson(importPerson, authentication);
+}
+ }
+ }
+ else{
+ // add new users or put user to another group
+ createNewPerson(importPerson);
+ }
+
+ }
+ @Transactional
+ private void addPerson(PersonExportImportVO importPerson,
+ Authentication authentication) {
+ Person person = new Person();
+ person.setEmail(importPerson.getEmail());
+ person.setActive(importPerson.getActive());
+ person.setAuthenticationId(authentication.getId());
+ getSession().saveOrUpdate(authentication);
+ updatePerson(person);
+ }
+ @Transactional(propagation = Propagation.REQUIRED)
+ private void createNewPerson(PersonExportImportVO xperson) {
+
+ Authentication authentication = xperson.getAuthentication();
+
if(authenticationService.authenticationExists(authentication.getUserId())
xperson.getAuthorityId()0 ){
+ Authority authority = this.getAuthorityById(xperson.getAuthorityId());
+ if(null!=authority){
+authentication =
authenticationService.getAuthenticationById(authenticationService.getAuthenticationIdForUserId(authentication.getUserId()));
+authentication.getAuthorities().add(authority);
+getSession().saveOrUpdate(authentication);
+ }
+ }
+ else
if(!authenticationService.authenticationExists(authentication.getUserId())){
+ authentication =
authenticationService.createAuthentication(authentication);
+ if(xperson.getAuthorityId()0 ){
+Authority authority =
this.getAuthorityById(xperson.getAuthorityId());
+if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+}
+ }
+ addPerson(xperson, authentication);
+ }
+
+ }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- PersonService.java 23 Feb 2009 09:11:50 - 1.19
+++ PersonService.java 3 Mar 2009 06:23:55 - 1.20
@@ -88,4 +88,6 @@
public ListPersonExportImportVO getPersonExportImportVO(String group);
public ListAuthority getAllAuthorities();
+
+ public void ImportDataFromFileRecord(String level, PersonExportImportVO
importPerson);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv1748/src/java/com/finalist/cmsc/services/community/person
Modified Files:
Tag: b1_5
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -b -r1.23.2.3 -r1.23.2.4
--- PersonHibernateService.java 23 Feb 2009 15:34:21 - 1.23.2.3
+++ PersonHibernateService.java 3 Mar 2009 06:29:49 - 1.23.2.4
@@ -15,6 +15,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
@@ -25,6 +26,7 @@
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+
import com.finalist.cmsc.paging.PagingStatusHolder;
import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.cmsc.services.HibernateService;
@@ -500,4 +502,68 @@
criteria = criteria.setResultTransformer(criteria.DISTINCT_ROOT_ENTITY);
return criteria.list();
}
+ @Transactional
+ public void ImportDataFromFileRecord(String level,
+ PersonExportImportVO importPerson) {
+ Person p =
getPersonByUserId(importPerson.getAuthentication().getUserId());
+ if (over.equals(level)) {
+ if(p != null) {
+
authenticationService.updateAuthenticationPassword(importPerson.getAuthentication().getUserId(),
importPerson.getAuthentication().getPassword());
+p.setEmail(importPerson.getEmail());
+p.setActive(importPerson.getActive());
+updatePerson(p);
+ }
+ else {
+Authentication authentication =
authenticationService.createAuthentication(importPerson.getAuthentication());
+if (authentication.getId() != null) {
+ if(importPerson.getAuthorityId()0 ){
+ Authority authority =
this.getAuthorityById(importPerson.getAuthorityId());
+ if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+ }
+ }
+ addPerson(importPerson, authentication);
+}
+ }
+ }
+ else{
+ // add new users or put user to another group
+ createNewPerson(importPerson);
+ }
+
+ }
+ @Transactional
+ private void addPerson(PersonExportImportVO importPerson,
+ Authentication authentication) {
+ Person person = new Person();
+ person.setEmail(importPerson.getEmail());
+ person.setActive(importPerson.getActive());
+ person.setAuthenticationId(authentication.getId());
+ getSession().saveOrUpdate(authentication);
+ updatePerson(person);
+ }
+ @Transactional(propagation = Propagation.REQUIRED)
+ private void createNewPerson(PersonExportImportVO xperson) {
+
+ Authentication authentication = xperson.getAuthentication();
+
if(authenticationService.authenticationExists(authentication.getUserId())
xperson.getAuthorityId()0 ){
+ Authority authority = this.getAuthorityById(xperson.getAuthorityId());
+ if(null!=authority){
+authentication =
authenticationService.getAuthenticationById(authenticationService.getAuthenticationIdForUserId(authentication.getUserId()));
+authentication.getAuthorities().add(authority);
+getSession().saveOrUpdate(authentication);
+ }
+ }
+ else
if(!authenticationService.authenticationExists(authentication.getUserId())){
+ authentication =
authenticationService.createAuthentication(authentication);
+ if(xperson.getAuthorityId()0 ){
+Authority authority =
this.getAuthorityById(xperson.getAuthorityId());
+if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+}
+ }
+ addPerson(xperson, authentication);
+ }
+
+ }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv1944/src/java/com/finalist/cmsc/services/community/person
Modified Files:
Tag: b1_6
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -b -r1.26 -r1.26.2.1
--- PersonHibernateService.java 23 Feb 2009 09:11:50 - 1.26
+++ PersonHibernateService.java 3 Mar 2009 06:35:46 - 1.26.2.1
@@ -502,4 +502,68 @@
criteria = criteria.setResultTransformer(criteria.DISTINCT_ROOT_ENTITY);
return criteria.list();
}
+ @Transactional
+ public void ImportDataFromFileRecord(String level,
+ PersonExportImportVO importPerson) {
+ Person p =
getPersonByUserId(importPerson.getAuthentication().getUserId());
+ if (over.equals(level)) {
+ if(p != null) {
+
authenticationService.updateAuthenticationPassword(importPerson.getAuthentication().getUserId(),
importPerson.getAuthentication().getPassword());
+p.setEmail(importPerson.getEmail());
+p.setActive(importPerson.getActive());
+updatePerson(p);
+ }
+ else {
+Authentication authentication =
authenticationService.createAuthentication(importPerson.getAuthentication());
+if (authentication.getId() != null) {
+ if(importPerson.getAuthorityId()0 ){
+ Authority authority =
this.getAuthorityById(importPerson.getAuthorityId());
+ if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+ }
+ }
+ addPerson(importPerson, authentication);
+}
+ }
+ }
+ else{
+ // add new users or put user to another group
+ createNewPerson(importPerson);
+ }
+
+ }
+ @Transactional
+ private void addPerson(PersonExportImportVO importPerson,
+ Authentication authentication) {
+ Person person = new Person();
+ person.setEmail(importPerson.getEmail());
+ person.setActive(importPerson.getActive());
+ person.setAuthenticationId(authentication.getId());
+ getSession().saveOrUpdate(authentication);
+ updatePerson(person);
+ }
+ @Transactional(propagation = Propagation.REQUIRED)
+ private void createNewPerson(PersonExportImportVO xperson) {
+
+ Authentication authentication = xperson.getAuthentication();
+
if(authenticationService.authenticationExists(authentication.getUserId())
xperson.getAuthorityId()0 ){
+ Authority authority = this.getAuthorityById(xperson.getAuthorityId());
+ if(null!=authority){
+authentication =
authenticationService.getAuthenticationById(authenticationService.getAuthenticationIdForUserId(authentication.getUserId()));
+authentication.getAuthorities().add(authority);
+getSession().saveOrUpdate(authentication);
+ }
+ }
+ else
if(!authenticationService.authenticationExists(authentication.getUserId())){
+ authentication =
authenticationService.createAuthentication(authentication);
+ if(xperson.getAuthorityId()0 ){
+Authority authority =
this.getAuthorityById(xperson.getAuthorityId());
+if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+}
+ }
+ addPerson(xperson, authentication);
+ }
+
+ }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -b -r1.19 -r1.19.2.1
--- PersonService.java 23 Feb 2009 09:11:50 - 1.19
+++ PersonService.java 3 Mar 2009 06:35:46 - 1.19.2.1
@@ -88,4 +88,6 @@
public ListPersonExportImportVO getPersonExportImportVO(String group);
public ListAuthority getAllAuthorities();
+
+ public void ImportDataFromFileRecord(String level, PersonExportImportVO
importPerson);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv5044/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 - Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- PersonHibernateService.java 2 Dec 2008 06:39:34 - 1.25
+++ PersonHibernateService.java 23 Feb 2009 09:11:50 - 1.26
@@ -8,7 +8,14 @@
*/
package com.finalist.cmsc.services.community.person;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
@@ -19,6 +26,7 @@
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+
import com.finalist.cmsc.paging.PagingStatusHolder;
import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.cmsc.services.HibernateService;
@@ -27,6 +35,7 @@
import com.finalist.cmsc.services.community.preferences.PreferenceService;
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.services.community.security.Authority;
/**
* @author Remco Bos
@@ -210,10 +219,26 @@
@SuppressWarnings(unchecked)
public void creatRelationRecord(PersonExportImportVO xperson) {
Authentication authentication = xperson.getAuthentication();
+
if(authenticationService.authenticationExists(authentication.getUserId())
xperson.getAuthorityId()0 ){
+ Authority authority = this.getAuthorityById(xperson.getAuthorityId());
+ if(null!=authority){
+authentication =
authenticationService.getAuthenticationById(authenticationService.getAuthenticationIdForUserId(authentication.getUserId()));
+authentication.getAuthorities().add(authority);
+getSession().saveOrUpdate(authentication);
+ }
+ }
+ else
if(!authenticationService.authenticationExists(authentication.getUserId())){
authentication =
authenticationService.createAuthentication(authentication);
+ if(xperson.getAuthorityId()0 ){
+Authority authority =
this.getAuthorityById(xperson.getAuthorityId());
+if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+}
+ }
Person person = new Person();
converPersonPropertis(xperson, person);
person.setAuthenticationId(authentication.getId());
+ getSession().saveOrUpdate(authentication);
updatePerson(person);
String userId = xperson.getAuthentication().getUserId();
List Preference preferences = xperson.getPreferences();
@@ -223,6 +248,7 @@
}
}
}
+ }
@Transactional(readOnly = true)
public List PersonExportImportVO getPersonExportImportVO() {
@@ -237,6 +263,19 @@
}
return XPersons;
}
+ @Transactional(readOnly = true)
+ public List PersonExportImportVO getPersonExportImportVO(String group) {
+ List PersonExportImportVO XPersons = new ArrayList
PersonExportImportVO ();
+ List Person persons = getPersonsByGroup(group);
+ if (null == persons) {
+ return null;
+ }
+ for (Person tempPerson : persons) {
+ PersonExportImportVO o = transformToPersonExportImportVO(tempPerson);
+ XPersons.add(o);
+ }
+ return XPersons;
+ }
private void converPersonPropertis(Person t, Person o) {
o.setFirstName(t.getFirstName());
@@ -245,6 +284,8 @@
o.setLastName(t.getLastName());
o.setEmail(t.getEmail());
o.setUri(t.getUri());
+ o.setActive(t.getActive());
+ o.setRegisterDate(t.getRegisterDate());
}
private PersonExportImportVO transformToPersonExportImportVO(Person
tempPerson) {
@@ -261,6 +302,14 @@
o.setPreferences(preferences);
return o;
}
+ private ListPerson getPersonsByGroup(String groupId){
+ String sql = select distinct person from Person person , Authentication
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv15371/src/java/com/finalist/cmsc/services/community/person
Modified Files:
Tag: b1_5
PersonHibernateService.java PersonService.java
Log Message:
CMSC-1265 - Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -b -r1.23.2.2 -r1.23.2.3
--- PersonHibernateService.java 2 Dec 2008 09:46:51 - 1.23.2.2
+++ PersonHibernateService.java 23 Feb 2009 15:34:21 - 1.23.2.3
@@ -8,7 +8,13 @@
*/
package com.finalist.cmsc.services.community.person;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
@@ -27,6 +33,7 @@
import com.finalist.cmsc.services.community.preferences.PreferenceService;
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.services.community.security.Authority;
/**
* @author Remco Bos
@@ -210,10 +217,26 @@
@SuppressWarnings(unchecked)
public void creatRelationRecord(PersonExportImportVO xperson) {
Authentication authentication = xperson.getAuthentication();
+
if(authenticationService.authenticationExists(authentication.getUserId())
xperson.getAuthorityId()0 ){
+ Authority authority = this.getAuthorityById(xperson.getAuthorityId());
+ if(null!=authority){
+authentication =
authenticationService.getAuthenticationById(authenticationService.getAuthenticationIdForUserId(authentication.getUserId()));
+authentication.getAuthorities().add(authority);
+getSession().saveOrUpdate(authentication);
+ }
+ }
+ else
if(!authenticationService.authenticationExists(authentication.getUserId())){
authentication =
authenticationService.createAuthentication(authentication);
+ if(xperson.getAuthorityId()0 ){
+Authority authority =
this.getAuthorityById(xperson.getAuthorityId());
+if (null!=authentication.getAuthorities()) {
+ authentication.getAuthorities().add(authority);
+}
+ }
Person person = new Person();
converPersonPropertis(xperson, person);
person.setAuthenticationId(authentication.getId());
+ getSession().saveOrUpdate(authentication);
updatePerson(person);
String userId = xperson.getAuthentication().getUserId();
List Preference preferences = xperson.getPreferences();
@@ -223,6 +246,7 @@
}
}
}
+ }
@Transactional(readOnly = true)
public List PersonExportImportVO getPersonExportImportVO() {
@@ -237,6 +261,19 @@
}
return XPersons;
}
+ @Transactional(readOnly = true)
+ public List PersonExportImportVO getPersonExportImportVO(String group) {
+ List PersonExportImportVO XPersons = new ArrayList
PersonExportImportVO ();
+ List Person persons = getPersonsByGroup(group);
+ if (null == persons) {
+ return null;
+ }
+ for (Person tempPerson : persons) {
+ PersonExportImportVO o = transformToPersonExportImportVO(tempPerson);
+ XPersons.add(o);
+ }
+ return XPersons;
+ }
private void converPersonPropertis(Person t, Person o) {
o.setFirstName(t.getFirstName());
@@ -245,6 +282,8 @@
o.setLastName(t.getLastName());
o.setEmail(t.getEmail());
o.setUri(t.getUri());
+ o.setActive(t.getActive());
+ o.setRegisterDate(t.getRegisterDate());
}
private PersonExportImportVO transformToPersonExportImportVO(Person
tempPerson) {
@@ -261,6 +300,14 @@
o.setPreferences(preferences);
return o;
}
+ private ListPerson getPersonsByGroup(String groupId){
+ String sql = select distinct person from Person person , Authentication
authentication +
+ left join authentication.authorities authority +
+ where person.authenticationId = authentication.id+
+ and authority.id = +Integer.parseInt(groupId);
+ Query q = getSession().createQuery(sql);
+ return q.list();
+ }
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv16175/services/community/person
Modified Files:
Tag: b1_5
PersonHibernateService.java PersonService.java
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -b -r1.23.2.1 -r1.23.2.2
--- PersonHibernateService.java 6 Nov 2008 07:46:28 - 1.23.2.1
+++ PersonHibernateService.java 2 Dec 2008 09:46:51 - 1.23.2.2
@@ -431,4 +431,10 @@
creatRelationRecord(importPerson);
}
}
+ @Transactional
+ public void changeStateByAuthenticationId(Long authenticationId, String
active) {
+ Person per=getPersonByAuthenticationId(authenticationId);
+ per.setActive(active);
+ updatePerson(per);
+ }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- PersonService.java 6 Nov 2008 07:46:28 - 1.16.2.1
+++ PersonService.java 2 Dec 2008 09:46:51 - 1.16.2.2
@@ -81,4 +81,6 @@
public List Person getPersonsByAuthenticationIds(Set Integer
authenticationIds, String name, String email);
public void addRelationRecord(String level, PersonExportImportVO
importPerson);
+
+ void changeStateByAuthenticationId(Long authenticationId, String active);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv8543/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-949, Blocking users: user status enhancements,show state through Action
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- PersonHibernateService.java 6 Nov 2008 07:04:22 - 1.24
+++ PersonHibernateService.java 2 Dec 2008 06:39:34 - 1.25
@@ -431,4 +431,10 @@
creatRelationRecord(importPerson);
}
}
+ @Transactional
+ public void changeStateByAuthenticationId(Long authenticationId, String
active) {
+ Person per=getPersonByAuthenticationId(authenticationId);
+ per.setActive(active);
+ updatePerson(per);
+ }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- PersonService.java 6 Nov 2008 07:04:22 - 1.17
+++ PersonService.java 2 Dec 2008 06:39:34 - 1.18
@@ -81,4 +81,6 @@
public List Person getPersonsByAuthenticationIds(Set Integer
authenticationIds, String name, String email);
public void addRelationRecord(String level, PersonExportImportVO
importPerson);
+
+ void changeStateByAuthenticationId(Long authenticationId, String active);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv1017/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-947, Improve the newletter import/export into a generic community
import/export,fix overwrite bug
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- PersonHibernateService.java 5 Aug 2008 05:50:16 - 1.20
+++ PersonHibernateService.java 19 Sep 2008 07:59:31 - 1.21
@@ -10,17 +10,16 @@
package com.finalist.cmsc.services.community.person;
import java.util.*;
-
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
+import org.hibernate.Session;
import org.hibernate.criterion.Example;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-
import com.finalist.cmsc.paging.PagingStatusHolder;
import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.cmsc.services.HibernateService;
@@ -219,10 +218,12 @@
updatePerson(person);
String userId = xperson.getAuthentication().getUserId();
ListPreference preferences = xperson.getPreferences();
+ if (preferences.size()0) {
for (Preference preference : preferences) {
preferenceService.createPreference(preference, userId);
}
}
+ }
@Transactional(readOnly = true)
public ListPersonExportImportVO getPersonExportImportVO() {
@@ -381,5 +382,62 @@
persons = q.list();
}
return persons;
+}
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ private void updateRelationRecord(Person oldDataPerson,
PersonExportImportVO importPerson) {
+ Session session=getSession();
+ Authentication activedAuthentication =
importPerson.getAuthentication();
+ Authentication dbAuthentication=(Authentication)
session.load(Authentication.class,oldDataPerson.getId());
+ converPersonPropertis(importPerson, oldDataPerson);
+ converAuthenticationPropertis(activedAuthentication,
dbAuthentication);
+ parsePreferences(importPerson, session,
activedAuthentication,dbAuthentication);
+ }
+
+ private void parsePreferences(PersonExportImportVO importPerson,Session
session, Authentication activedAuthentication,
+ Authentication dbAuthentication) {
+ ListPreference
importPreferences=importPerson.getPreferences();
+ ListPreference
dbPreferences=preferenceService.getListPreferencesByUserId(activedAuthentication.getUserId());
+ MapLong,Preference util=new HashMap();
+ for(Preference iPreference:importPreferences){
+
iPreference.setAuthenticationId(dbAuthentication.getId());
+ util.put(iPreference.getId(), iPreference);
+ }
+ for (Preference dbPreference : dbPreferences) {
+ Preference
activePreference=util.get(dbPreference.getId());
+ if (null!=activePreference) {
+ converPreferencePropertis(activePreference,
dbPreference);
+ util.remove(dbPreference.getId());
+ }
+ }
+ for (Map.EntryLong,Preference entry : util.entrySet()) {
+ session.save(entry.getValue());
+ }
+ }
+
+ private void converPreferencePropertis(Preference
iPreference,Preference dbPreference) {
+
dbPreference.setAuthenticationId(iPreference.getAuthenticationId());
+ dbPreference.setKey(iPreference.getKey());
+ dbPreference.setModule(iPreference.getModule());
+ dbPreference.setValue(iPreference.getValue());
+ }
+
+ private void converAuthenticationPropertis( Authentication
activedAuthentication,Authentication dbAuthentication) {
+
dbAuthentication.setAuthorities(activedAuthentication.getAuthorities());
+
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv18192
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-956 make all subscriber show correct data
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-956
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- PersonHibernateService.java 4 Aug 2008 08:32:05 - 1.19
+++ PersonHibernateService.java 5 Aug 2008 05:50:16 - 1.20
@@ -9,32 +9,26 @@
*/
package com.finalist.cmsc.services.community.person;
-import com.finalist.cmsc.paging.PagingStatusHolder;
-import com.finalist.cmsc.paging.PagingUtils;
-import com.finalist.cmsc.services.HibernateService;
-import com.finalist.cmsc.services.community.domain.PersonExportImportVO;
-import com.finalist.cmsc.services.community.preferences.Preference;
-import com.finalist.cmsc.services.community.preferences.PreferenceService;
-import com.finalist.cmsc.services.community.security.Authentication;
-import com.finalist.cmsc.services.community.security.AuthenticationService;
-import com.finalist.cmsc.services.community.security.Authority;
+import java.util.*;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.criterion.Example;
import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Property;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.finalist.cmsc.paging.PagingStatusHolder;
+import com.finalist.cmsc.paging.PagingUtils;
+import com.finalist.cmsc.services.HibernateService;
+import com.finalist.cmsc.services.community.domain.PersonExportImportVO;
+import com.finalist.cmsc.services.community.preferences.Preference;
+import com.finalist.cmsc.services.community.preferences.PreferenceService;
+import com.finalist.cmsc.services.community.security.Authentication;
+import com.finalist.cmsc.services.community.security.AuthenticationService;
/**
* @author Remco Bos
@@ -106,7 +100,7 @@
if (authenticationId == null) {
throw new IllegalArgumentException(authenticationId is not filled
in. );
}
- //Create a new person and store it
+ // Create a new person and store it
Person person = new Person();
person.setFirstName(firstName);
person.setInfix(infix);
@@ -356,8 +350,36 @@
condition = String.format(query, conditions.get(name));
}
- return +condition;
+ return + condition;
}
+ @Transactional
+ public ListPerson getPersonsByAuthenticationIds(SetInteger
authenticationIds, String name, String email) {
+ ListPerson persons = null;
+ if (authenticationIds.size() 0) {
+ StringBuffer stb = new StringBuffer(select distinct
person from Person person);
+ stb.append( where person.authenticationId in ();
+ for (int authId : authenticationIds) {
+ stb.append(authId + ,);
+ }
+ stb.delete(stb.length() - 1, stb.length());
+ stb.append());
+ if (StringUtils.isNotBlank(email)) {
+ stb.append( and person.email like '% + email
+ %');
+ }
+ if (StringUtils.isNotBlank(name)) {
+ String[] names = name.split( );
+ if (names.length = 2) {
+ stb.append( and (person.firstName like
'% + names[0] + %' or person.firstName like '% + name + %')
+ + and
(person.lastName like '% + names[1] + %' or person.lastName like '% + name +
%'));
+ } else if (names.length == 1) {
+ stb.append( and (person.firstName like
'% + names[0] + %'));
+ }
+ }
+ Query q = getSession().createQuery(stb.toString());
+ persons = q.list();
+ }
+
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv32158/community/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-996 code improve.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-996
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- PersonHibernateService.java 30 Jul 2008 09:52:38 - 1.15
+++ PersonHibernateService.java 31 Jul 2008 02:29:28 - 1.16
@@ -40,12 +40,15 @@
private AuthenticationService authenticationService;
private PreferenceService preferenceService;
+
@Required
public void setPreferenceService(PreferenceService preferenceService) {
this.preferenceService = preferenceService;
}
- /** [EMAIL PROTECTED] */
+ /**
+* [EMAIL PROTECTED]
+*/
@Transactional(readOnly = true)
public Person getPersonByUserId(String userId) {
if (StringUtils.isBlank(userId)) {
@@ -54,7 +57,9 @@
return findPersonByUserId(userId);
}
- /** [EMAIL PROTECTED] */
+ /**
+* [EMAIL PROTECTED]
+*/
@Transactional
@SuppressWarnings(unchecked)
public ListPerson getPersons(Person example) {
@@ -67,7 +72,9 @@
}
- /** [EMAIL PROTECTED] */
+ /**
+* [EMAIL PROTECTED]
+*/
@Transactional
public ListPerson getLikePersons(Person example) {
if (example == null) {
@@ -106,38 +113,35 @@
return person;
}
- /** [EMAIL PROTECTED] */
+ /**
+* [EMAIL PROTECTED]
+*/
@Transactional
public void updatePerson(Person person) {
getSession().saveOrUpdate(person);
getSession().flush();
}
+
@Transactional
- public ListPerson getAllPeople(PagingStatusHolder holder) {
+ public ListPerson getAllPeople() {
return getAssociatedPersons(null);
}
+
@Transactional
public ListPerson getAllPersons() {
Criteria criteria = getSession().createCriteria(Person.class);
return criteria.list();
}
+
@Transactional(readOnly = true)
-public int countAllPersons(){
+ public int countAllPersons() {
Criteria criteria = getSession().createCriteria(Person.class);
return criteria.list().size();
}
-private void addOrder(PagingStatusHolder holder, String propertyName,
- Criteria criteria) {
- String dir = holder.getDir();
- if (asc.equals(dir)) {
-criteria.addOrder(Property.forName(propertyName).asc());
- }
- if (desc.equals(dir)) {
-criteria.addOrder(Property.forName(propertyName).desc());
- }
- }
- /** [EMAIL PROTECTED] */
+ /**
+* [EMAIL PROTECTED]
+*/
@Transactional
public boolean deletePersonByAuthenticationId(Long authenticationId) {
if (authenticationId != null) {
@@ -166,7 +170,9 @@
this.authenticationService = authenticationService;
}
- /** [EMAIL PROTECTED] */
+ /**
+* [EMAIL PROTECTED]
+*/
@Transactional(readOnly = true)
public Person getPersonByAuthenticationId(Long authenticationId) {
Person person = null;
@@ -178,9 +184,9 @@
}
@Transactional(readOnly = true)
- public Person getPersonByEmail(String email){
+ public Person getPersonByEmail(String email) {
Person person = null;
- if(email != null){
+ if (email != null) {
Criteria criteria =
getSession().createCriteria(Person.class).add(Restrictions.eq(email, email));
person = findPersonByCriteria(criteria);
}
@@ -188,10 +194,10 @@
}
@Transactional
- public void batchClean(){
+ public void batchClean() {
ListPerson persons = getAllPersons();
for (Person tempPerson : persons) {
- if(null!=tempPerson){
+ if (null != tempPerson) {
long authId = tempPerson.getAuthenticationId();
deleteRelationRecord(authId);
}
@@ -224,7 +230,7 @@
@Transactional(readOnly = true)
public ListPersonExportImportVO getPersonExportImportVO() {
ListPersonExportImportVO XPersons = new
ArrayListPersonExportImportVO();
- ListPerson persons =getAllPersons();
+ ListPerson persons = getAllPersons();
if (null == persons) {
return null;
}
@@ -267,7 +273,7 @@
StringBuffer strb = new StringBuffer();
basicGetAssociatedPersons(conditions, strb);
- strb.append( +holder.getSortToken());
+
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv19184
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-996,User and Group lists in Editors,add search relation people option
record fuction
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-996
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- PersonHibernateService.java 24 Jul 2008 06:30:14 - 1.12
+++ PersonHibernateService.java 27 Jul 2008 07:41:23 - 1.13
@@ -12,11 +12,16 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
+import org.hibernate.Query;
+import org.hibernate.Session;
import org.hibernate.criterion.Example;
import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Property;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.MatchMode;
import org.springframework.beans.factory.annotation.Required;
@@ -29,6 +34,7 @@
import com.finalist.cmsc.services.community.preferences.PreferenceService;
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.paging.*;
/**
* @author Remco Bos
@@ -109,12 +115,32 @@
getSession().saveOrUpdate(person);
getSession().flush();
}
-
+ @Transactional
+ public ListPerson getAllPeople(PagingStatusHolder holder) {
+ return getAssociatedPersons(null,holder);
+ }
@Transactional
public ListPerson getAllPersons() {
- return getSession().createCriteria(Person.class).list();
+ Criteria criteria = getSession().createCriteria(Person.class);
+ return criteria.list();
+ }
+@Transactional(readOnly = true)
+public int countAllPersons(){
+ Criteria criteria = getSession().createCriteria(Person.class);
+ return criteria.list().size();
+}
+private void addOrder(PagingStatusHolder holder, String propertyName,
+ Criteria criteria) {
+ /*if (propertyName.equals(holder.getSort())) {*/
+ String dir = holder.getDir();
+ if (asc.equals(dir)) {
+
criteria.addOrder(Property.forName(propertyName).asc());
+ }
+ if (desc.equals(dir)) {
+
criteria.addOrder(Property.forName(propertyName).desc());
}
+ }
/** [EMAIL PROTECTED] */
@Transactional
public boolean deletePersonByAuthenticationId(Long authenticationId) {
@@ -136,7 +162,7 @@
@SuppressWarnings(unchecked)
private Person findPersonByCriteria(Criteria criteria) {
ListPerson personList = criteria.list();
- return personList.size() == 1 ? personList.get(0) : null;
+ return personList.size() 0 ? personList.get(0) : null;
}
@Required
@@ -236,4 +262,78 @@
o.setPreferences(preferences);
return o;
}
+ @Transactional(readOnly = true)
+ public ListPerson getAssociatedPersons(Map
conditions,PagingStatusHolder holder) {
+ // 2008.7.10ƴдsqlÓï¾äHQL sentences
+ StringBuffer strb=new StringBuffer();
+
+ basicGetAssociatedPersons(conditions,strb);
+
+ if(fullname.equals(holder.getSort())){
+ strb.append(String.format( order by %s
%s,person.firstName +holder.getDir(),,person.lastName +holder.getDir()));
+ }else if(username.equals(holder.getSort())){
+ strb.append(String.format( order by %s %s,
authentication.userId,holder.getDir()));
+ }else if(email.equals(holder.getSort())){
+ strb.append(String.format( order by %s
%s,person.email,holder.getDir()));
+ }
+
+ Query q = getSession().createQuery(strb.toString());
+
+ q.setMaxResults(holder.getPageSize())
+.setFirstResult(holder.getOffset());
+
+ return q.list();
+ }
+ private void basicGetAssociatedPersons(Map conditions, StringBuffer strb){
+ strb.append(select distinct person from Person person ,
Authentication authentication
+
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv8269/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-947, Improve the newletter import/export into a generic community
import/export,cheched the code
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PersonHibernateService.java 15 Jul 2008 04:39:16 - 1.9
+++ PersonHibernateService.java 15 Jul 2008 12:30:31 - 1.10
@@ -93,7 +93,6 @@
if (authenticationId == null) {
throw new IllegalArgumentException(authenticationId is not filled
in. );
}
-
//Create a new person and store it
Person person = new Person();
person.setFirstName(firstName);
@@ -102,7 +101,6 @@
person.setAuthenticationId(authenticationId); // used to find account
getSession().save(person);
return person;
-
}
/** [EMAIL PROTECTED] */
@@ -111,6 +109,8 @@
getSession().saveOrUpdate(person);
getSession().flush();
}
+
+
@Transactional
public ListPerson getAllPersons() {
return getSession().createCriteria(Person.class).list();
@@ -165,16 +165,12 @@
}
return person;
}
+
@Transactional
public void createPerson(Person person) {
getSession().save(person);
+ }
- }/*
- @Transactional
- public int batchClean(String type, String condition) {
-
- return 0;
- }*/
@Transactional(propagation = Propagation.REQUIRED)
public void batchClean(){
ListPerson persons = getAllPersons();
@@ -189,10 +185,8 @@
.executeUpdate();
getSession().createQuery(hqlDeletePerson)
.executeUpdate();
-
-
-
}
+
@Transactional(propagation = Propagation.REQUIRED)
public void deleteRelationRecord(Long id) {
//long id = dataPerson.getAuthenticationId();
@@ -200,6 +194,7 @@
authenticationService.deleteAuthentication(id);
deletePersonByAuthenticationId(id);
}
+
@Transactional(propagation = Propagation.REQUIRED)
@SuppressWarnings(unchecked)
public void creatRelationRecord(PersonExportImportVO xperson) {
@@ -215,15 +210,16 @@
preferenceService.createPreference(preference, userId);
}
}
+
@Transactional(readOnly = true)
- public ListPersonExportImportVO getAllXPerson() {
+ public ListPersonExportImportVO getPersonExportImportVO() {
ListPersonExportImportVO XPersons = new
ArrayListPersonExportImportVO();
ListPerson persons =getAllPersons();
if (null == persons) {
return null;
}
for (Person tempPerson : persons) {
- PersonExportImportVO o = transformToXPerson(tempPerson);
+ PersonExportImportVO o =
transformToPersonExportImportVO(tempPerson);
XPersons.add(o);
}
return XPersons;
@@ -238,8 +234,7 @@
o.setUri(t.getUri());
}
-
- private PersonExportImportVO transformToXPerson(Person tempPerson) {
+ private PersonExportImportVO transformToPersonExportImportVO(Person
tempPerson) {
PersonExportImportVO o = new PersonExportImportVO();
converPersonPropertis(tempPerson, o);
Long authenticationId = tempPerson.getAuthenticationId();
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PersonService.java 15 Jul 2008 04:39:16 - 1.6
+++ PersonService.java 15 Jul 2008 12:30:31 - 1.7
@@ -61,11 +61,14 @@
ListPerson getAllPersons();
boolean deletePersonByAuthenticationId(Long userId);
+
public void batchClean();
public void createPerson(Person person);
+
public void deleteRelationRecord(Long id);
public void creatRelationRecord(PersonExportImportVO xperson);
-
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv8632
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-947, Improve the newletter import/export into a generic community
import/export,cheched the code
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- PersonHibernateService.java 15 Jul 2008 12:30:31 - 1.10
+++ PersonHibernateService.java 15 Jul 2008 12:45:10 - 1.11
@@ -110,7 +110,6 @@
getSession().flush();
}
-
@Transactional
public ListPerson getAllPersons() {
return getSession().createCriteria(Person.class).list();
@@ -166,11 +165,6 @@
return person;
}
- @Transactional
- public void createPerson(Person person) {
- getSession().save(person);
- }
-
@Transactional(propagation = Propagation.REQUIRED)
public void batchClean(){
ListPerson persons = getAllPersons();
@@ -203,7 +197,7 @@
Person person = new Person();
converPersonPropertis(xperson, person);
person.setAuthenticationId(authentication.getId());
- createPerson(person);
+ updatePerson(person);
String userId = xperson.getAuthentication().getUserId();
ListPreference preferences = xperson.getPreferences();
for (Preference preference : preferences) {
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PersonService.java 15 Jul 2008 12:30:31 - 1.7
+++ PersonService.java 15 Jul 2008 12:45:10 - 1.8
@@ -64,8 +64,6 @@
public void batchClean();
- public void createPerson(Person person);
-
public void deleteRelationRecord(Long id);
public void creatRelationRecord(PersonExportImportVO xperson);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv31196/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-947) Improve the newletter import/export into a generic community
import/export,add Xtream in project.xml
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-947
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PersonHibernateService.java 4 Jul 2008 08:04:20 - 1.8
+++ PersonHibernateService.java 15 Jul 2008 04:39:16 - 1.9
@@ -9,18 +9,25 @@
*/
package com.finalist.cmsc.services.community.person;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.criterion.Example;
+import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.MatchMode;
import org.springframework.beans.factory.annotation.Required;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import com.finalist.cmsc.services.HibernateService;
+import com.finalist.cmsc.services.community.domain.PersonExportImportVO;
+import com.finalist.cmsc.services.community.preferences.Preference;
+import com.finalist.cmsc.services.community.preferences.PreferenceService;
+import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
/**
@@ -29,6 +36,11 @@
public class PersonHibernateService extends HibernateService implements
PersonService {
private AuthenticationService authenticationService;
+private PreferenceService preferenceService;
+ @Required
+ public void setPreferenceService(PreferenceService preferenceService) {
+ this.preferenceService = preferenceService;
+ }
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
@@ -153,4 +165,92 @@
}
return person;
}
+ @Transactional
+ public void createPerson(Person person) {
+ getSession().save(person);
+
+ }/*
+ @Transactional
+ public int batchClean(String type, String condition) {
+
+ return 0;
+ }*/
+ @Transactional(propagation = Propagation.REQUIRED)
+ public void batchClean(){
+ ListPerson persons = getAllPersons();
+ for (Person tempPerson : persons) {
+ long authenticationId =
tempPerson.getAuthenticationId();
+
preferenceService.batchCleanByAuthenticationId(authenticationId);
+
+ }
+ String hqlDeletePerson = delete Person;
+ String hqlDeleteAuthentication = delete Authentication;
+ getSession().createQuery(hqlDeleteAuthentication)
+.executeUpdate();
+ getSession().createQuery(hqlDeletePerson)
+ .executeUpdate();
+
+
+
+ }
+ @Transactional(propagation = Propagation.REQUIRED)
+ public void deleteRelationRecord(Long id) {
+ //long id = dataPerson.getAuthenticationId();
+ preferenceService.batchCleanByAuthenticationId(id);
+ authenticationService.deleteAuthentication(id);
+ deletePersonByAuthenticationId(id);
+ }
+ @Transactional(propagation = Propagation.REQUIRED)
+ @SuppressWarnings(unchecked)
+ public void creatRelationRecord(PersonExportImportVO xperson) {
+ Authentication authentication = xperson.getAuthentication();
+ authentication =
authenticationService.createAuthentication(authentication);
+ Person person = new Person();
+ converPersonPropertis(xperson, person);
+ person.setAuthenticationId(authentication.getId());
+ createPerson(person);
+ String userId = xperson.getAuthentication().getUserId();
+ ListPreference preferences = xperson.getPreferences();
+ for (Preference preference : preferences) {
+ preferenceService.createPreference(preference, userId);
+ }
+ }
+ @Transactional(readOnly = true)
+ public
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory james.mmbase.org:/tmp/cvs-serv5008
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
cmsc-888 add function implement in Person Service
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PersonHibernateService.java 7 May 2008 02:54:19 - 1.5
+++ PersonHibernateService.java 10 Jun 2008 09:48:25 - 1.6
@@ -145,4 +145,13 @@
return person;
}
+ @Transactional(readOnly = true)
+ public Person getPersonByEmail(String email){
+ Person person = null;
+ if(email != null){
+ Criteria criteria =
getSession().createCriteria(Person.class).add(Restrictions.eq(email, email));
+ person = findPersonByCriteria(criteria);
+ }
+ return person;
+ }
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PersonService.java 7 May 2008 02:54:19 - 1.4
+++ PersonService.java 10 Jun 2008 09:48:25 - 1.5
@@ -47,6 +47,8 @@
Person getPersonByAuthenticationId(Long authenticationId);
+ Person getPersonByEmail(String email);
+
Person createPerson(String firstName, String infix, String lastName, Long
authenticationId);
/*
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv23218/community/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java
Log Message:
CMSC-888 fix.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-888
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PersonHibernateService.java 31 Mar 2008 19:49:02 - 1.4
+++ PersonHibernateService.java 7 May 2008 02:54:19 - 1.5
@@ -16,6 +16,7 @@
import org.hibernate.Criteria;
import org.hibernate.criterion.Example;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.criterion.MatchMode;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +54,23 @@
/** [EMAIL PROTECTED] */
@Transactional
+ public ListPerson getLikePersons(Person example) {
+ if (example == null) {
+ return Collections.emptyList();
+ }
+
+ Example userExample = Example.create(example).
+enableLike(MatchMode.ANYWHERE).
+excludeZeroes().
+ignoreCase();
+ List personList =
getSession().createCriteria(Person.class).add(userExample).list();
+ return personList;
+ }
+
+ /**
+* [EMAIL PROTECTED]
+*/
+ @Transactional
public Person createPerson(String firstName, String infix, String lastName,
Long authenticationId) {
if (firstName == null) {
throw new IllegalArgumentException(Firstname is null. );
@@ -82,6 +100,10 @@
getSession().saveOrUpdate(person);
getSession().flush();
}
+@Transactional
+ public ListPerson getAllPersons() {
+ return getSession().createCriteria(Person.class).list();
+ }
/** [EMAIL PROTECTED] */
@Transactional
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PersonService.java 31 Mar 2008 19:49:02 - 1.3
+++ PersonService.java 7 May 2008 02:54:19 - 1.4
@@ -35,6 +35,16 @@
*/
ListPerson getPersons(Person example);
+ /**
+* Get a list of matching persons that like the given example. The fields
+* that are set on the example Person are the criteria for the search.
+*
+* @param example
+* the example person
+* @return a list of persons that like the given example.
+*/
+ ListPerson getLikePersons(Person example);
+
Person getPersonByAuthenticationId(Long authenticationId);
Person createPerson(String firstName, String infix, String lastName, Long
authenticationId);
@@ -44,6 +54,8 @@
*/
void updatePerson(Person person);
+ ListPerson getAllPersons();
+
boolean deletePersonByAuthenticationId(Long userId);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv15345/community/src/java/com/finalist/cmsc/services/community/person
Modified Files:
Tag: b1_4
PersonHibernateService.java PersonService.java
Log Message:
CMSC-830 - Add Send Password functionality: major updates to Community and Form
validations.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-830
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- PersonHibernateService.java 21 Mar 2008 16:46:29 - 1.2.2.2
+++ PersonHibernateService.java 25 Mar 2008 18:46:26 - 1.2.2.3
@@ -13,8 +13,6 @@
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
import org.hibernate.criterion.Example;
import org.hibernate.criterion.Restrictions;
@@ -29,8 +27,6 @@
*/
public class PersonHibernateService extends HibernateService implements
PersonService {
- private static Log log =
LogFactory.getLog(PersonHibernateService.class);
-
private AuthenticationService authenticationService;
/** [EMAIL PROTECTED] */
@@ -86,6 +82,7 @@
@Transactional
public void updatePerson(Person person) {
getSession().saveOrUpdate(person);
+ getSession().flush();
}
@@ -104,14 +101,7 @@
private Person findPersonByUserId(String userId) {
Long authenticationId =
authenticationService.getAuthenticationIdForUserId(userId);
- Person person = null;
- if (authenticationId != null) {
- Criteria criteria = getSession()
-
.createCriteria(Person.class)
-
.add(Restrictions.eq(authenticationId, authenticationId));
- person = findPersonByCriteria(criteria);
- }
- return person;
+ return getPersonByAuthentication(authenticationId);
}
@SuppressWarnings(unchecked)
@@ -125,4 +115,17 @@
this.authenticationService = authenticationService;
}
+ /** [EMAIL PROTECTED] */
+ @Transactional(readOnly = true)
+ public Person getPersonByAuthentication(Long authenticationId) {
+ Person person = null;
+ if (authenticationId != null) {
+ Criteria criteria = getSession()
+ .createCriteria(Person.class)
+ .add(Restrictions.eq(authenticationId,
authenticationId));
+ person = findPersonByCriteria(criteria);
+ }
+ return person;
+ }
+
}
Index: PersonService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- PersonService.java 21 Mar 2008 16:46:29 - 1.2.2.1
+++ PersonService.java 25 Mar 2008 18:46:26 - 1.2.2.2
@@ -27,6 +27,8 @@
ListPerson getPerson(Person person);
+Person getPersonByAuthentication(Long authenticationId);
+
Person createPerson(String firstName, String infix, String lastName, Long
authenticationId);
/* Save or update the person to the database
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java Person.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv12548/community/src/java/com/finalist/cmsc/services/community/person
Modified Files:
Tag: b1_4
PersonHibernateService.java PersonService.java Person.java
Log Message:
CMSC-830 - Add Send Password functionality and improve Community source code,
not fully ready, but big steps are made.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
See also: http://www.mmbase.org/jira/browse/CMSC-830
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- PersonHibernateService.java 25 Feb 2008 16:26:17 - 1.2.2.1
+++ PersonHibernateService.java 21 Mar 2008 16:46:29 - 1.2.2.2
@@ -9,11 +9,14 @@
*/
package com.finalist.cmsc.services.community.person;
+import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Criteria;
+import org.hibernate.criterion.Example;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.transaction.annotation.Transactional;
@@ -33,40 +36,79 @@
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
public Person getPersonByUserId(String userId) {
+ if (StringUtils.isBlank(userId)) {
+ throw new IllegalArgumentException(UserId is not
filled in. );
+ }
return findPersonByUserId(userId);
}
/** [EMAIL PROTECTED] */
@Transactional
- public void createPerson(String firstName, String infix, String
lastName, String userId) {
- Long authenticationId =
authenticationService.getAuthenticationIdForUserId(userId);
+ @SuppressWarnings(unchecked)
+ public ListPerson getPerson(Person person){
+ if (person == null)
+ return Collections.emptyList();
+
+ List personList = getSession()
+ .createCriteria(Person.class)
+ .add(Example.create(person))
+ .list();
+ return personList;
+
+ }
+
+ /** [EMAIL PROTECTED] */
+ @Transactional
+ public Person createPerson(String firstName, String infix, String
lastName, Long authenticationId) {
+ if (firstName == null) {
+ throw new IllegalArgumentException(Firstname is null.
);
+ }
+ if (lastName == null) {
+ throw new IllegalArgumentException(Lastname is null.
);
+ }
+ if (authenticationId == null) {
+ throw new IllegalArgumentException(authenticationId is
not filled in. );
+ }
+
if (authenticationId != null) {
Person person = new Person();
person.setFirstName(firstName);
person.setInfix(infix);
person.setLastName(lastName);
- person.setAuthenticationId(authenticationId);
+ person.setAuthenticationId(authenticationId); //used to
find account
getSession().save(person);
+ return person;
}
+ return null;
}
/** [EMAIL PROTECTED] */
@Transactional
- public void deletePersonByUserId(String userId) {
- if (userId != null) {
+ public void updatePerson(Person person) {
+ getSession().saveOrUpdate(person);
+ }
+
+
+ /** [EMAIL PROTECTED] */
+ @Transactional
+ public boolean deletePersonByUserId(String userId) {
+ if (!StringUtils.isBlank(userId)) {
Person person = findPersonByUserId(userId);
if (person != null) {
getSession().delete(person);
+ return true;
}
}
+ return false;
}
private Person findPersonByUserId(String userId) {
Long authenticationId =
authenticationService.getAuthenticationIdForUserId(userId);
Person person = null;
if (authenticationId != null) {
- Criteria criteria =
getSession().createCriteria(Person.class).add(
-
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person PersonHibernateService.java PersonService.java Person.java
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
In directory
james.mmbase.org:/tmp/cvs-serv1/src/java/com/finalist/cmsc/services/community/person
Modified Files:
PersonHibernateService.java PersonService.java Person.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person
Index: PersonHibernateService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PersonHibernateService.java 25 Jan 2008 13:03:39 - 1.1
+++ PersonHibernateService.java 29 Jan 2008 09:59:40 - 1.2
@@ -9,73 +9,70 @@
*/
package com.finalist.cmsc.services.community.person;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Iterator;
-import java.io.Serializable;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.Criteria;
-import org.springframework.transaction.annotation.Transactional;
+import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Required;
+import org.springframework.transaction.annotation.Transactional;
import com.finalist.cmsc.services.HibernateService;
-import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
-import com.finalist.cmsc.services.community.preferences.PreferenceService;
-import com.finalist.cmsc.services.community.preferences.Preference;
/**
* @author Remco Bos
*/
public class PersonHibernateService extends HibernateService implements
PersonService {
-/** [EMAIL PROTECTED] */
-@Transactional(readOnly = true)
-public Person getPerson(String userName) {
-return findPersonByUserName(userName);
-}
+ private AuthenticationService authenticationService;
/** [EMAIL PROTECTED] */
@Transactional(readOnly = true)
-public boolean personExists(String userName) {
-return findPersonByUserName(userName) != null;
+public Person getPersonByUserId(String userId) {
+ return findPersonByUserId(userId);
}
/** [EMAIL PROTECTED] */
@Transactional
-public void setPersonProperties(String userName, MapString, Serializable
properties) {
-Person person = findPersonByUserName(userName);
-person.setProperties(properties);
-}
-
-/** [EMAIL PROTECTED] */
-@Transactional
-public Person createPerson(MapString, Serializable properties) {
+public void createPerson(String firstName, String infix, String lastName,
String userId) {
+ Long authenticationId =
authenticationService.getAuthenticationIdForUserId(userId);
+ if (authenticationId != null) {
Person person = new Person();
-person.setProperties(properties);
+person.setFirstName(firstName);
+person.setInfix(infix);
+person.setLastName(lastName);
+person.setAuthenticationId(authenticationId);
getSession().save(person);
-return person;
+ }
}
/** [EMAIL PROTECTED] */
@Transactional
-public void deletePerson(String userName) {
-Person person = findPersonByUserName(userName);
+public void deletePersonByUserId(String userId) {
+Person person = findPersonByUserId(userId);
getSession().delete(person);
}
-private Person findPersonByUserName(String userName) {
+private Person findPersonByUserId(String userId) {
+ Long authenticationId =
authenticationService.getAuthenticationIdForUserId(userId);
+ Person person = null;
+ if (authenticationId != null) {
Criteria criteria = getSession()
-.createCriteria(Authentication.class)
-.add(Restrictions.eq(userName, userName));
-return findPersonByCriteria(criteria);
+ .createCriteria(Person.class)
+ .add(Restrictions.eq(authenticationId,
authenticationId));
+ person = findPersonByCriteria(criteria);
+ }
+return person;
}
+@SuppressWarnings(unchecked)
private Person findPersonByCriteria(Criteria criteria) {
List personList = criteria.list();
return personList.size() == 1 ? (Person) personList.get(0) : null;
}
+
+@Required
+public void setAuthenticationService(AuthenticationService
authenticationService) {
+this.authenticationService = authenticationService;
+}
}
Index: PersonService.java
===
RCS file:
