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 -0000 1.9
+++ PersonHibernateService.java 15 Jul 2008 12:30:31 -0000 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 List<Person> 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(){
List<Person> 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 List<PersonExportImportVO> getAllXPerson() {
+ public List<PersonExportImportVO> getPersonExportImportVO() {
List<PersonExportImportVO> XPersons = new
ArrayList<PersonExportImportVO>();
List<Person> 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 -0000 1.6
+++ PersonService.java 15 Jul 2008 12:30:31 -0000 1.7
@@ -61,11 +61,14 @@
List<Person> getAllPersons();
boolean deletePersonByAuthenticationId(Long userId);
+
public void batchClean();
public void createPerson(Person person);
+
public void deleteRelationRecord(Long id);
public void creatRelationRecord(PersonExportImportVO xperson);
- public List<PersonExportImportVO> getAllXPerson();
+
+ public List<PersonExportImportVO> getPersonExportImportVO();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
