August 2009 - Bonzoms-commits - mailman.cloud.codelutin.com

r58 - in trunk/bonzoms-ui/src/main/webapp: js person
by fdesbois＠users.chorem.org Aug. 27, 2009

Aug. 27, 2009

Author: fdesbois Date: 2009-08-27 14:58:52 +0200 (Thu, 27 Aug 2009) New Revision: 58 Modified: trunk/bonzoms-ui/src/main/webapp/js/window_ajax.js trunk/bonzoms-ui/src/main/webapp/person/PersonForm.tml Log: Suppress old debug in UI before release Modified: trunk/bonzoms-ui/src/main/webapp/js/window_ajax.js =================================================================== --- trunk/bonzoms-ui/src/main/webapp/js/window_ajax.js 2009-08-26 15:39:57 UTC (rev 57) +++ trunk/bonzoms-ui/src/main/webapp/js/window_ajax.js 2009-08-27 12:58:52 UTC (rev 58) @@ -8,7 +8,7 @@ * uri : Uri de la page à afficher */ initialize: function(element, uri, windowTitle, width, height) { - Tapestry.debug('Initialize AjaxWindow :uri= '+uri); + //Tapestry.debug('Initialize AjaxWindow :uri= '+uri); // Création d'une fenêtre this.window = new Window('dialog'+element, { className: 'alphacube', @@ -24,7 +24,7 @@ }, openWindow: function(e) { e.stop(); - Tapestry.debug('Click'); + //Tapestry.debug('Click'); // Ouverture de la fenêtre avec chargement en Ajax this.window.setAjaxContent(this.uri,null,true,true); } Modified: trunk/bonzoms-ui/src/main/webapp/person/PersonForm.tml =================================================================== --- trunk/bonzoms-ui/src/main/webapp/person/PersonForm.tml 2009-08-26 15:39:57 UTC (rev 57) +++ trunk/bonzoms-ui/src/main/webapp/person/PersonForm.tml 2009-08-27 12:58:52 UTC (rev 58) @@ -41,6 +41,6 @@ </p:comment> </t:beaneditform> </t:zone> - <a t:type="windowlink" t:id="testWindow" t:page="person/list">TEST</a> - <t:pagelink t:page="person/list">${message:list-person-return}</t:pagelink> +  </t:layout> \ No newline at end of file

1 0

r57 - in trunk: . bonzoms-business/src/main/java/org/chorem/bonzoms bonzoms-business/src/main/java/org/chorem/bonzoms/business bonzoms-business/src/main/java/org/chorem/bonzoms/export bonzoms-business/src/main/java/org/chorem/bonzoms/impl bonzoms-business/src/main/resources bonzoms-business/src/test/java/org/chorem/bonzoms/export bonzoms-business/src/test/java/org/chorem/bonzoms/impl bonzoms-business/src/test/resources bonzoms-ui/src/main/java/org/chorem/bonzoms bonzoms-ui/src/main/java/or
by fdesbois＠users.chorem.org Aug. 26, 2009

Aug. 26, 2009

Author: fdesbois Date: 2009-08-26 17:39:57 +0200 (Wed, 26 Aug 2009) New Revision: 57 Modified: trunk/ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/ContextUtilBonzoms.java trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/business/BonzomsTypeHelper.java trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationDTO.java trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/base/GenericSelectModel.java trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/components/ContactComponent.java trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/pages/RolesAndRelations.java trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/ContactComponent.tml trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonForm_en.properties trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonForm_fr.properties trunk/bonzoms-ui/src/main/webapp/RolesAndRelations.tml trunk/bonzoms-ui/src/main/webapp/js/chenillekit/Chenillekit.js trunk/bonzoms-ui/src/main/webapp/js/chenillekit/CkOnEvents.js trunk/bonzoms-ui/src/main/webapp/js/window/window.js trunk/bonzoms-ui/src/main/webapp/js/window/window_effects.js trunk/bonzoms-ui/src/main/webapp/js/window/window_ext.js trunk/bonzoms-ui/src/site/rst/ trunk/pom.xml Log: merge branche 1.0.0-rc-3-memberships-xpil and trunk Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/1.0.0-rc-3-memberships-xpil:54-56 Property changes on: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/ContextUtilBonzoms.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/business/BonzomsTypeHelper.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java 2009-08-26 15:39:57 UTC (rev 57) @@ -28,8 +28,10 @@ import org.chorem.bonzoms.persistence.GroupPersonEntity; import org.chorem.bonzoms.persistence.PartyEntity; import org.chorem.bonzoms.persistence.PersonEntity; +import org.chorem.bonzoms.persistence.RelationshipEntity; import org.chorem.bonzoms.services.ServiceOrganization; import org.chorem.bonzoms.services.ServiceParty; +import org.chorem.bonzoms.services.ServicePerson; import org.chorem.choreg.exceptions.WrongTypeException; import org.chorem.oasis.ciq.api.XNLHelper; import org.chorem.oasis.ciq.api.XPILHelper; @@ -40,6 +42,8 @@ import urn.oasis.names.tc.ciq.xnl.PartyNameType.PersonName; import urn.oasis.names.tc.ciq.xnl.PersonNameElementList; import urn.oasis.names.tc.ciq.xnl.SubDivisionTypeList; +import urn.oasis.names.tc.ciq.xpil.MembershipElementList; +import urn.oasis.names.tc.ciq.xpil.MembershipsDocument.Memberships; import urn.oasis.names.tc.ciq.xpil.PartyDocument; import urn.oasis.names.tc.ciq.xpil.PartyType; @@ -108,7 +112,7 @@ * @return the PartyDocument created * @see org.chorem.oasis.ciq.api.XNLHelper */ - public static PartyDocument getDocument(GroupPersonEntity organization, List<GroupPersonEntity> subDivisions) { + public static PartyDocument getDocumentForOrganisation(GroupPersonEntity organization, List<GroupPersonEntity> subDivisions) { PartyDocument doc = getDocument(organization, ServiceOrganization.class); OrganisationName name = doc.getParty().getPartyName().getOrganisationNameArray(0); @@ -123,6 +127,41 @@ return doc; } + public static PartyDocument getDocumentForPerson(PersonEntity personEntity, List<RelationshipEntity> divisions, RelationshipEntity employment) { + PartyDocument doc = getDocument(personEntity, ServicePerson.class); + + // Ajout de l'element Memberships/Membership pour ajouter la societe et les services de la personne + // MembershipElement = choremUri de la societe + // Organisation/NameElement = nom de la societe + // Organisation/(SubDivisionName)* = noms des services/divisions + + GroupPersonEntity organisationEntity = (GroupPersonEntity) employment.getToRole().getPartyEntity(); + String organisationId = Convert.toChoremUri(ServiceOrganization.class, organisationEntity); + + Memberships.Membership membership = doc.getParty().addNewMemberships().addNewMembership(); + + Memberships.Membership.MembershipElement element = membership.addNewMembershipElement(); + element.setType(MembershipElementList.MEMBERSHIP_NUMBER); + element.setStringValue(organisationId); + + Memberships.Membership.Organisation organisation = membership.addNewOrganisation(); + + Memberships.Membership.Organisation.NameElement organisationName = organisation.addNewNameElement(); + organisationName.setElementType(OrganisationNameElementList.NAME_ONLY); + organisationName.setStringValue(organisationEntity.getName()); + + for (RelationshipEntity relation : divisions) { + GroupPersonEntity division = (GroupPersonEntity) relation.getToRole().getPartyEntity(); + + Memberships.Membership.Organisation.SubDivisionName subDivisionName = organisation.addNewSubDivisionName(); + + subDivisionName.setType(SubDivisionTypeList.DIVISION); + subDivisionName.setStringValue(division.getName()); + } + + return doc; + } + /** * Getting correct object depends on class required for converting PartyDocument. * PartyDocument can be exported in multiples types to be used in ChoReg : String, InputStream and XMLStreamReader. Property changes on: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationDTO.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java 2009-08-26 15:39:57 UTC (rev 57) @@ -62,7 +62,7 @@ divisions.add((GroupPersonEntity)relation.getFromRole().getPartyEntity()); } - return FormatXPIL.getDocument(entity, divisions); + return FormatXPIL.getDocumentForOrganisation(entity, divisions); } return null; } Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java 2009-08-26 15:39:57 UTC (rev 57) @@ -167,7 +167,7 @@ } @Override - protected Person convert(PersonEntity entity) throws ConvertException { + protected Person convert(PersonEntity entity, TopiaContext transaction) throws Exception { return PartyHelper.getPerson(entity); } Property changes on: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java 2009-08-26 15:39:57 UTC (rev 57) @@ -60,7 +60,7 @@ PersonEntity entity = ServiceHelper.getEntity(dao, id, log); - person = convert(entity); + person = convert(entity, transaction); transaction.closeContext(); } catch (Exception eee) { @@ -78,7 +78,7 @@ PersonEntityDAO dao = BonzomsModelDAOHelper.getPersonEntityDAO(transaction); for (PersonEntity entity : dao.findAll()) { - T person = (T) convert(entity); + T person = (T) convert(entity, transaction); persons.add(person); } @@ -89,6 +89,6 @@ return persons; } - protected abstract T convert(PersonEntity entity) throws ConvertException; - + protected abstract T convert(PersonEntity entity, TopiaContext transaction) throws Exception; + } Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java 2009-08-26 15:39:57 UTC (rev 57) @@ -19,18 +19,23 @@ package org.chorem.bonzoms.impl; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.bonzoms.ContextUtilBonzoms; +import org.chorem.bonzoms.BonzomsModelDAOHelper; +import org.chorem.bonzoms.enums.RelationshipTypeValues; import org.chorem.bonzoms.export.FormatXPIL; +import org.chorem.bonzoms.persistence.PartyRoleEntity; +import org.chorem.bonzoms.persistence.PartyRoleEntityDAO; import org.chorem.bonzoms.persistence.PersonEntity; +import org.chorem.bonzoms.persistence.RelationshipEntity; +import org.chorem.bonzoms.persistence.RelationshipEntityDAO; +import org.chorem.bonzoms.persistence.RelationshipType; import org.chorem.bonzoms.services.ServicePerson; -import org.chorem.exceptions.ConvertException; import org.chorem.choreg.ChoremService; import org.chorem.choreg.FormatType; +import org.chorem.utils.DateUtils; import org.nuiton.topia.TopiaContext; import urn.oasis.names.tc.ciq.xpil.PartyDocument; @@ -50,7 +55,50 @@ private static final Log log = LogFactory.getLog(ServicePersonXPIL.class); @Override - protected PartyDocument convert(PersonEntity entity) throws ConvertException { + protected PartyDocument convert(PersonEntity entity, TopiaContext transaction) throws Exception { + + RelationshipEntityDAO relationDAO = BonzomsModelDAOHelper.getRelationshipEntityDAO(transaction); + + PartyRoleEntityDAO roleDAO = BonzomsModelDAOHelper.getPartyRoleEntityDAO(transaction); + + List<RelationshipEntity> employments = transaction.find( + "FROM " + RelationshipEntity.class.getName() + + " WHERE " + RelationshipEntity.FROM_ROLE + "." + PartyRoleEntity.PARTY_ENTITY + " = :person " + + " AND " + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :type" + + " ORDER BY " + RelationshipEntity.FROM_DATE + " DESC, " + RelationshipEntity.THRU_DATE + " DESC", + "person", entity, + "type", RelationshipTypeValues.EMPLOYMENT); + + RelationshipEntity employment = null; + if (!employments.isEmpty()) { + employment = employments.get(0); // the most recent + + // FIXME if dates condition for employment relation + List<RelationshipEntity> results = transaction.find( + "SELECT divisionsRelation" + + " FROM " + RelationshipEntity.class.getName() + " AS divisionsRelation, " + RelationshipEntity.class.getName() + " AS rollupRelation" + + " WHERE divisionsRelation." + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :typeWorkDivision" + + " AND divisionsRelation." + RelationshipEntity.FROM_ROLE + " = :employeeRole" + + " AND divisionsRelation." + RelationshipEntity.TO_ROLE + " = rollupRelation." + RelationshipEntity.FROM_ROLE + + " AND rollupRelation." + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :typeRollupDivision" + + " AND rollupRelation." + RelationshipEntity.TO_ROLE + "." + PartyRoleEntity.PARTY_ENTITY + " = :employer", + "typeWorkDivision", RelationshipTypeValues.WORK_FOR_DIVISION, + "employeeRole", employment.getFromRole(), + "typeRollupDivision", RelationshipTypeValues.ROLLUP_DIVISION, + "employer", employment.getToRole().getPartyEntity() + ); + + // FIXME add condition for dates into HQL query (thruDate can be null) + List<RelationshipEntity> divisions = new ArrayList<RelationshipEntity>(); + for (RelationshipEntity relation : results) { + if (DateUtils.currentPeriod(relation.getFromDate(), relation.getThruDate())) { + divisions.add(relation); + } + } + + return FormatXPIL.getDocumentForPerson(entity, divisions, employment); + } + return FormatXPIL.getDocument(entity, ServicePerson.class); } Property changes on: trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java =================================================================== --- trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java 2009-08-26 15:39:57 UTC (rev 57) @@ -21,16 +21,26 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; +import javax.xml.stream.XMLStreamReader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.bonzoms.BonzomsException; import org.chorem.bonzoms.BonzomsModelDAOHelper; import org.chorem.bonzoms.ContextUtilBonzoms; +import org.chorem.bonzoms.dto.GroupPerson; import org.chorem.bonzoms.dto.Person; +import org.chorem.bonzoms.dto.Relationship; +import org.chorem.bonzoms.impl.ServiceOrganizationDTO; +import org.chorem.bonzoms.impl.ServiceOrganizationImplTest; import org.chorem.bonzoms.impl.ServicePersonDTO; +import org.chorem.bonzoms.impl.ServicePersonXPIL; import org.chorem.bonzoms.persistence.PersonEntity; import org.chorem.bonzoms.persistence.PersonEntityDAO; +import org.chorem.bonzoms.services.ServiceOrganization; import org.chorem.bonzoms.services.ServicePerson; +import org.chorem.choreg.ChoremConvert; +import org.chorem.utils.DateUtils; import org.chorem.utils.ServiceHelper; import org.junit.After; import org.junit.AfterClass; @@ -86,7 +96,7 @@ */ @Test public void testGetDocument() throws TopiaException { - System.out.println("getDocument"); + log.info("getDocument"); ServicePerson servicePerson = new ServicePersonDTO(); @@ -131,4 +141,67 @@ } } + @Test + public void testGetDocumentForPerson() throws TopiaException { + log.info("getDocumentForPerson"); + + ServicePerson servicePerson = new ServicePersonDTO(); + ServiceOrganization serviceOrganization = new ServiceOrganizationDTO(); + ServicePersonXPIL serviceXpil = new ServicePersonXPIL(); + + log.debug("TEST:: CREATE ORGANIZATION 'Societe' "); + GroupPerson organisation = ServiceOrganizationImplTest.testCreateOrganization(serviceOrganization, "Societe"); + + log.debug("TEST:: CREATE PERSON 'Arnaud Thimel' / CREATE RELATION PERSON and ORGANIZATION"); + Relationship employmentRelation = + ServiceOrganizationImplTest.addEmployee( + servicePerson, serviceOrganization, "Arnaud", "Thimel", DateUtils.createDate(13,3,2009), null, organisation); + + String personId = employmentRelation.getParty().getId(); + //String choremUri = ChoremConvert.toChoremUri(ServicePerson.class, personId); + + log.debug("TEST:: CREATE DIVISION 'Informatique' / CREATE RELATION DIVISION and ORGANIZATION"); + GroupPerson divisionInformatique = ServiceOrganizationImplTest.testAddDivision( + serviceOrganization, "Informatique", organisation, DateUtils.createDate(13,3,2009), DateUtils.createDate(13,7,2009)); + + log.debug("TEST:: CREATE DIVISION 'Communication' / CREATE RELATION DIVISION and ORGANIZATION"); + GroupPerson divisionCommunication = ServiceOrganizationImplTest.testAddDivision( + serviceOrganization, "Communication", organisation, DateUtils.createDate(13,3,2009), null); + + try { + log.debug("TEST:: CREATE RELATION PERSON and DIVISION 'Informatique' with old thruDate "); + Relationship divisionInformatiqueEmployee = serviceOrganization.getNewEmployeeDivisionRelation(employmentRelation); + divisionInformatiqueEmployee.setPartyParent(divisionInformatique); + divisionInformatiqueEmployee.setThruDate(DateUtils.createDate(13,5,2009)); + serviceOrganization.addEmployeeToDivision(divisionInformatiqueEmployee); + + log.debug("TEST:: CREATE RELATION PERSON and DIVISION 'Communication' with no thruDate "); + Relationship divisionCommunicationEmployee = serviceOrganization.getNewEmployeeDivisionRelation(employmentRelation); + divisionCommunicationEmployee.setPartyParent(divisionCommunication); + divisionCommunicationEmployee.setThruDate(null); + serviceOrganization.addEmployeeToDivision(divisionCommunicationEmployee); + } catch (BonzomsException eee) { + fail("BonzomsException : " + eee.getMessage()); + } + + try { + String res = serviceXpil.find(String.class, personId); + + log.info(res); + + } catch (Exception eee) { + fail("Exception : " + eee.getMessage()); + } + + try { + servicePerson.deletePerson(personId); + serviceOrganization.deleteGroupPerson(organisation.getId()); + serviceOrganization.deleteGroupPerson(divisionInformatique.getId()); + serviceOrganization.deleteGroupPerson(divisionCommunication.getId()); + } catch (BonzomsException eee) { + fail("BonzomsException : " + eee.getMessage()); + } + + } + } \ No newline at end of file Modified: trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java =================================================================== --- trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java 2009-08-26 15:39:57 UTC (rev 57) @@ -87,7 +87,7 @@ log.debug("TEST:: CREATE ORGANIZATION"); GroupPerson groupPerson = testCreateOrganization(serviceOrganization, "Code Lutin !"); - log.debug("TEST:: CREATE PERSON"); + /*log.debug("TEST:: CREATE PERSON"); Person person = servicePerson.getNewPerson(); person.setFirstName("Arnaud"); person.setLastName("Thimel"); @@ -121,8 +121,13 @@ } String idRel = rel.getId(); - assertNotNull(idRel); - + assertNotNull(idRel);*/ + + Relationship rel = + addEmployee(servicePerson, serviceOrganization, "Arnaud", "Thimel", createDate(13,3,2009), createDate(13,12,2009), groupPerson); + String idRel = rel.getId(); + String idPerson = rel.getParty().getId(); + try { List<Relationship> relations = serviceOrganization.getAllRelationships(groupPerson); @@ -174,7 +179,7 @@ } - GroupPerson testCreateOrganization(ServiceOrganization service, String organizationName) { + public static GroupPerson testCreateOrganization(ServiceOrganization service, String organizationName) { GroupPerson organization = service.getNewOrganization(); organization.setName(organizationName); try { @@ -188,6 +193,42 @@ return organization; } + public static Relationship addEmployee(ServicePerson servicePerson, ServiceOrganization serviceOrganization, String personFirstName, + String personLastName, Date fromDate, Date thruDate, GroupPerson employer) { + log.debug("TEST:: CREATE PERSON"); + Person person = servicePerson.getNewPerson(); + person.setFirstName(personFirstName); + person.setLastName(personLastName); + + try { + servicePerson.createUpdatePerson(person); + assertNotNull(person.getId()); + } catch (BonzomsException eee) { + log.debug("createUpdatePerson error"); + fail("BonzomsException"); + } + + log.debug("TEST:: ADD EMPLOYEE"); // CREATION DES ROLES + + Relationship rel = new Relationship(); + rel.setFromDate(fromDate); + rel.setThruDate(thruDate); + + rel.setParty(person); + rel.setPartyParent(employer); + rel.setType(RelationshipTypeValues.EMPLOYMENT); + + try { + serviceOrganization.addEmployee(rel); + assertNotNull(rel.getId()); + } catch (BonzomsException eee) { + log.debug("addEmployee error"); + fail("BonzomsException"); + } + + return rel; + } + @Test public void testDivisionRelationships() { log.info("addDivision"); @@ -247,9 +288,9 @@ GroupPerson company = testCreateOrganization(service, "Code Lutin !"); log.debug("TEST:: ADD DIVISION : " + divisionName); - String id = testAddDivision(service, divisionName, company, createDate(18,5,2009), null); + GroupPerson division = testAddDivision(service, divisionName, company, createDate(18,5,2009), null); - assertNotNull(id); + assertNotNull(division.getId()); try { log.debug("TEST:: GET DIVISION NAMES START WITH : In"); @@ -266,7 +307,7 @@ log.debug("TEST:: NETTOYAGE"); try { service.deleteGroupPerson(company.getId()); - service.deleteGroupPerson(id); + service.deleteGroupPerson(division.getId()); } catch (BonzomsException eee) { log.debug("deleteGroupPerson error"); fail("BonzomsException"); @@ -281,7 +322,7 @@ * @param fromDate * @param thruDate */ - String testAddDivision(ServiceOrganization service, String divisionName, GroupPerson company, Date fromDate, Date thruDate) { + public static GroupPerson testAddDivision(ServiceOrganization service, String divisionName, GroupPerson company, Date fromDate, Date thruDate) { Relationship rel = service.getNewDivisionRelation(); rel.setFromDate(fromDate); rel.setThruDate(thruDate); @@ -293,7 +334,7 @@ log.debug("addDivision error"); fail("BonzomsException"); } - return rel.getParty().getId(); + return (GroupPerson) rel.getParty(); } /** Property changes on: trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/base/GenericSelectModel.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/components/ContactComponent.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/pages/RolesAndRelations.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java =================================================================== --- trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java 2009-08-26 15:39:57 UTC (rev 57) @@ -47,7 +47,7 @@ private static final Log log = LogFactory.getLog(ServiceUIPerson.class); - private static final String TMP_CONTEXT_PATH = "bonzoms-ui-1.0.0-rc-2-SNAPSHOT"; + private static final String TMP_CONTEXT_PATH = "bonzoms-ui"; private String server; private String contextPath; Property changes on: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/ContactComponent.tml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonForm_en.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonForm_fr.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/webapp/RolesAndRelations.tml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/webapp/js/chenillekit/Chenillekit.js ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/webapp/js/chenillekit/CkOnEvents.js ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/webapp/js/window/window.js ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/webapp/js/window/window_effects.js ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/main/webapp/js/window/window_ext.js ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/bonzoms-ui/src/site/rst ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-26 14:01:09 UTC (rev 56) +++ trunk/pom.xml 2009-08-26 15:39:57 UTC (rev 57) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <groupId>org.chorem</groupId> @@ -133,8 +133,8 @@ <properties>  - <topia.version>2.2.0-rc-5-SNAPSHOT</topia.version> - <generator.version>1.0.0-rc-3</generator.version> + <topia.version>2.2.0</topia.version> + <generator.version>1.0.0</generator.version> <jrst.version>1.0.0</jrst.version>  @@ -180,60 +180,7 @@ <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/bonzoms/trunk</developerConnection> <url>http://www.chorem.org/repositories/browse/bonzoms/trunk</url> </scm> - - <issueManagement> - <system>redmine</system> - <url>http://www.chorem.org/projects/bonzoms/issues</url> - </issueManagement> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.chorem.org</url> - </ciManagement> - -  - <mailingLists> - <mailingList> - <name>bonzoms-commits</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-commits</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-commits</unsubscribe> - <post>bonzoms-commits(a)$list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/bonzoms-commits/</archive> - </mailingList> - - <mailingList> - <name>bonzoms-devel</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-devel</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-devel</unsubscribe> - <post>bonzoms-devel(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/bonzoms-devel/</archive> - </mailingList> - - <mailingList> - <name>bonzoms-users</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-users</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-users</unsubscribe> - <post>bonzoms-users(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/bonzoms-users/</archive> - </mailingList> - </mailingLists> - -  - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/bonzoms</url> - </site> - </distributionManagement> - + <repositories>  <repository>

1 0

r56 - branches/1.0.0-rc-3-memberships-xpil/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services
by fdesbois＠users.chorem.org Aug. 26, 2009

Aug. 26, 2009

Author: fdesbois Date: 2009-08-26 16:01:09 +0200 (Wed, 26 Aug 2009) New Revision: 56 Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java Log: Change default contextpath Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java 2009-08-26 10:24:20 UTC (rev 55) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIPerson.java 2009-08-26 14:01:09 UTC (rev 56) @@ -47,7 +47,7 @@ private static final Log log = LogFactory.getLog(ServiceUIPerson.class); - private static final String TMP_CONTEXT_PATH = "bonzoms-ui-1.0.0-rc-2-SNAPSHOT"; + private static final String TMP_CONTEXT_PATH = "bonzoms-ui"; private String server; private String contextPath;

1 0

r55 - in branches/1.0.0-rc-3-memberships-xpil: . bonzoms-business/src/main/java/org/chorem/bonzoms/export bonzoms-business/src/main/java/org/chorem/bonzoms/impl bonzoms-business/src/test/java/org/chorem/bonzoms/export bonzoms-business/src/test/java/org/chorem/bonzoms/impl
by fdesbois＠users.chorem.org Aug. 26, 2009

Aug. 26, 2009

Author: fdesbois Date: 2009-08-26 12:24:20 +0200 (Wed, 26 Aug 2009) New Revision: 55 Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java branches/1.0.0-rc-3-memberships-xpil/pom.xml Log: - Change mavenpom and nuiton libraries versions - Add implementation for memberships in xPIL format + test Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/export/FormatXPIL.java 2009-08-26 10:24:20 UTC (rev 55) @@ -28,8 +28,10 @@ import org.chorem.bonzoms.persistence.GroupPersonEntity; import org.chorem.bonzoms.persistence.PartyEntity; import org.chorem.bonzoms.persistence.PersonEntity; +import org.chorem.bonzoms.persistence.RelationshipEntity; import org.chorem.bonzoms.services.ServiceOrganization; import org.chorem.bonzoms.services.ServiceParty; +import org.chorem.bonzoms.services.ServicePerson; import org.chorem.choreg.exceptions.WrongTypeException; import org.chorem.oasis.ciq.api.XNLHelper; import org.chorem.oasis.ciq.api.XPILHelper; @@ -40,6 +42,8 @@ import urn.oasis.names.tc.ciq.xnl.PartyNameType.PersonName; import urn.oasis.names.tc.ciq.xnl.PersonNameElementList; import urn.oasis.names.tc.ciq.xnl.SubDivisionTypeList; +import urn.oasis.names.tc.ciq.xpil.MembershipElementList; +import urn.oasis.names.tc.ciq.xpil.MembershipsDocument.Memberships; import urn.oasis.names.tc.ciq.xpil.PartyDocument; import urn.oasis.names.tc.ciq.xpil.PartyType; @@ -108,7 +112,7 @@ * @return the PartyDocument created * @see org.chorem.oasis.ciq.api.XNLHelper */ - public static PartyDocument getDocument(GroupPersonEntity organization, List<GroupPersonEntity> subDivisions) { + public static PartyDocument getDocumentForOrganisation(GroupPersonEntity organization, List<GroupPersonEntity> subDivisions) { PartyDocument doc = getDocument(organization, ServiceOrganization.class); OrganisationName name = doc.getParty().getPartyName().getOrganisationNameArray(0); @@ -123,6 +127,41 @@ return doc; } + public static PartyDocument getDocumentForPerson(PersonEntity personEntity, List<RelationshipEntity> divisions, RelationshipEntity employment) { + PartyDocument doc = getDocument(personEntity, ServicePerson.class); + + // Ajout de l'element Memberships/Membership pour ajouter la societe et les services de la personne + // MembershipElement = choremUri de la societe + // Organisation/NameElement = nom de la societe + // Organisation/(SubDivisionName)* = noms des services/divisions + + GroupPersonEntity organisationEntity = (GroupPersonEntity) employment.getToRole().getPartyEntity(); + String organisationId = Convert.toChoremUri(ServiceOrganization.class, organisationEntity); + + Memberships.Membership membership = doc.getParty().addNewMemberships().addNewMembership(); + + Memberships.Membership.MembershipElement element = membership.addNewMembershipElement(); + element.setType(MembershipElementList.MEMBERSHIP_NUMBER); + element.setStringValue(organisationId); + + Memberships.Membership.Organisation organisation = membership.addNewOrganisation(); + + Memberships.Membership.Organisation.NameElement organisationName = organisation.addNewNameElement(); + organisationName.setElementType(OrganisationNameElementList.NAME_ONLY); + organisationName.setStringValue(organisationEntity.getName()); + + for (RelationshipEntity relation : divisions) { + GroupPersonEntity division = (GroupPersonEntity) relation.getToRole().getPartyEntity(); + + Memberships.Membership.Organisation.SubDivisionName subDivisionName = organisation.addNewSubDivisionName(); + + subDivisionName.setType(SubDivisionTypeList.DIVISION); + subDivisionName.setStringValue(division.getName()); + } + + return doc; + } + /** * Getting correct object depends on class required for converting PartyDocument. * PartyDocument can be exported in multiples types to be used in ChoReg : String, InputStream and XMLStreamReader. Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServiceOrganizationXPIL.java 2009-08-26 10:24:20 UTC (rev 55) @@ -62,7 +62,7 @@ divisions.add((GroupPersonEntity)relation.getFromRole().getPartyEntity()); } - return FormatXPIL.getDocument(entity, divisions); + return FormatXPIL.getDocumentForOrganisation(entity, divisions); } return null; } Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonDTO.java 2009-08-26 10:24:20 UTC (rev 55) @@ -167,7 +167,7 @@ } @Override - protected Person convert(PersonEntity entity) throws ConvertException { + protected Person convert(PersonEntity entity, TopiaContext transaction) throws Exception { return PartyHelper.getPerson(entity); } Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java 2009-08-26 10:24:20 UTC (rev 55) @@ -60,7 +60,7 @@ PersonEntity entity = ServiceHelper.getEntity(dao, id, log); - person = convert(entity); + person = convert(entity, transaction); transaction.closeContext(); } catch (Exception eee) { @@ -78,7 +78,7 @@ PersonEntityDAO dao = BonzomsModelDAOHelper.getPersonEntityDAO(transaction); for (PersonEntity entity : dao.findAll()) { - T person = (T) convert(entity); + T person = (T) convert(entity, transaction); persons.add(person); } @@ -89,6 +89,6 @@ return persons; } - protected abstract T convert(PersonEntity entity) throws ConvertException; - + protected abstract T convert(PersonEntity entity, TopiaContext transaction) throws Exception; + } Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java 2009-08-26 10:24:20 UTC (rev 55) @@ -19,18 +19,23 @@ package org.chorem.bonzoms.impl; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.bonzoms.ContextUtilBonzoms; +import org.chorem.bonzoms.BonzomsModelDAOHelper; +import org.chorem.bonzoms.enums.RelationshipTypeValues; import org.chorem.bonzoms.export.FormatXPIL; +import org.chorem.bonzoms.persistence.PartyRoleEntity; +import org.chorem.bonzoms.persistence.PartyRoleEntityDAO; import org.chorem.bonzoms.persistence.PersonEntity; +import org.chorem.bonzoms.persistence.RelationshipEntity; +import org.chorem.bonzoms.persistence.RelationshipEntityDAO; +import org.chorem.bonzoms.persistence.RelationshipType; import org.chorem.bonzoms.services.ServicePerson; -import org.chorem.exceptions.ConvertException; import org.chorem.choreg.ChoremService; import org.chorem.choreg.FormatType; +import org.chorem.utils.DateUtils; import org.nuiton.topia.TopiaContext; import urn.oasis.names.tc.ciq.xpil.PartyDocument; @@ -50,7 +55,50 @@ private static final Log log = LogFactory.getLog(ServicePersonXPIL.class); @Override - protected PartyDocument convert(PersonEntity entity) throws ConvertException { + protected PartyDocument convert(PersonEntity entity, TopiaContext transaction) throws Exception { + + RelationshipEntityDAO relationDAO = BonzomsModelDAOHelper.getRelationshipEntityDAO(transaction); + + PartyRoleEntityDAO roleDAO = BonzomsModelDAOHelper.getPartyRoleEntityDAO(transaction); + + List<RelationshipEntity> employments = transaction.find( + "FROM " + RelationshipEntity.class.getName() + + " WHERE " + RelationshipEntity.FROM_ROLE + "." + PartyRoleEntity.PARTY_ENTITY + " = :person " + + " AND " + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :type" + + " ORDER BY " + RelationshipEntity.FROM_DATE + " DESC, " + RelationshipEntity.THRU_DATE + " DESC", + "person", entity, + "type", RelationshipTypeValues.EMPLOYMENT); + + RelationshipEntity employment = null; + if (!employments.isEmpty()) { + employment = employments.get(0); // the most recent + + // FIXME if dates condition for employment relation + List<RelationshipEntity> results = transaction.find( + "SELECT divisionsRelation" + + " FROM " + RelationshipEntity.class.getName() + " AS divisionsRelation, " + RelationshipEntity.class.getName() + " AS rollupRelation" + + " WHERE divisionsRelation." + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :typeWorkDivision" + + " AND divisionsRelation." + RelationshipEntity.FROM_ROLE + " = :employeeRole" + + " AND divisionsRelation." + RelationshipEntity.TO_ROLE + " = rollupRelation." + RelationshipEntity.FROM_ROLE + + " AND rollupRelation." + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :typeRollupDivision" + + " AND rollupRelation." + RelationshipEntity.TO_ROLE + "." + PartyRoleEntity.PARTY_ENTITY + " = :employer", + "typeWorkDivision", RelationshipTypeValues.WORK_FOR_DIVISION, + "employeeRole", employment.getFromRole(), + "typeRollupDivision", RelationshipTypeValues.ROLLUP_DIVISION, + "employer", employment.getToRole().getPartyEntity() + ); + + // FIXME add condition for dates into HQL query (thruDate can be null) + List<RelationshipEntity> divisions = new ArrayList<RelationshipEntity>(); + for (RelationshipEntity relation : results) { + if (DateUtils.currentPeriod(relation.getFromDate(), relation.getThruDate())) { + divisions.add(relation); + } + } + + return FormatXPIL.getDocumentForPerson(entity, divisions, employment); + } + return FormatXPIL.getDocument(entity, ServicePerson.class); } Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java 2009-08-26 10:24:20 UTC (rev 55) @@ -21,16 +21,26 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; +import javax.xml.stream.XMLStreamReader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.bonzoms.BonzomsException; import org.chorem.bonzoms.BonzomsModelDAOHelper; import org.chorem.bonzoms.ContextUtilBonzoms; +import org.chorem.bonzoms.dto.GroupPerson; import org.chorem.bonzoms.dto.Person; +import org.chorem.bonzoms.dto.Relationship; +import org.chorem.bonzoms.impl.ServiceOrganizationDTO; +import org.chorem.bonzoms.impl.ServiceOrganizationImplTest; import org.chorem.bonzoms.impl.ServicePersonDTO; +import org.chorem.bonzoms.impl.ServicePersonXPIL; import org.chorem.bonzoms.persistence.PersonEntity; import org.chorem.bonzoms.persistence.PersonEntityDAO; +import org.chorem.bonzoms.services.ServiceOrganization; import org.chorem.bonzoms.services.ServicePerson; +import org.chorem.choreg.ChoremConvert; +import org.chorem.utils.DateUtils; import org.chorem.utils.ServiceHelper; import org.junit.After; import org.junit.AfterClass; @@ -86,7 +96,7 @@ */ @Test public void testGetDocument() throws TopiaException { - System.out.println("getDocument"); + log.info("getDocument"); ServicePerson servicePerson = new ServicePersonDTO(); @@ -131,4 +141,67 @@ } } + @Test + public void testGetDocumentForPerson() throws TopiaException { + log.info("getDocumentForPerson"); + + ServicePerson servicePerson = new ServicePersonDTO(); + ServiceOrganization serviceOrganization = new ServiceOrganizationDTO(); + ServicePersonXPIL serviceXpil = new ServicePersonXPIL(); + + log.debug("TEST:: CREATE ORGANIZATION 'Societe' "); + GroupPerson organisation = ServiceOrganizationImplTest.testCreateOrganization(serviceOrganization, "Societe"); + + log.debug("TEST:: CREATE PERSON 'Arnaud Thimel' / CREATE RELATION PERSON and ORGANIZATION"); + Relationship employmentRelation = + ServiceOrganizationImplTest.addEmployee( + servicePerson, serviceOrganization, "Arnaud", "Thimel", DateUtils.createDate(13,3,2009), null, organisation); + + String personId = employmentRelation.getParty().getId(); + //String choremUri = ChoremConvert.toChoremUri(ServicePerson.class, personId); + + log.debug("TEST:: CREATE DIVISION 'Informatique' / CREATE RELATION DIVISION and ORGANIZATION"); + GroupPerson divisionInformatique = ServiceOrganizationImplTest.testAddDivision( + serviceOrganization, "Informatique", organisation, DateUtils.createDate(13,3,2009), DateUtils.createDate(13,7,2009)); + + log.debug("TEST:: CREATE DIVISION 'Communication' / CREATE RELATION DIVISION and ORGANIZATION"); + GroupPerson divisionCommunication = ServiceOrganizationImplTest.testAddDivision( + serviceOrganization, "Communication", organisation, DateUtils.createDate(13,3,2009), null); + + try { + log.debug("TEST:: CREATE RELATION PERSON and DIVISION 'Informatique' with old thruDate "); + Relationship divisionInformatiqueEmployee = serviceOrganization.getNewEmployeeDivisionRelation(employmentRelation); + divisionInformatiqueEmployee.setPartyParent(divisionInformatique); + divisionInformatiqueEmployee.setThruDate(DateUtils.createDate(13,5,2009)); + serviceOrganization.addEmployeeToDivision(divisionInformatiqueEmployee); + + log.debug("TEST:: CREATE RELATION PERSON and DIVISION 'Communication' with no thruDate "); + Relationship divisionCommunicationEmployee = serviceOrganization.getNewEmployeeDivisionRelation(employmentRelation); + divisionCommunicationEmployee.setPartyParent(divisionCommunication); + divisionCommunicationEmployee.setThruDate(null); + serviceOrganization.addEmployeeToDivision(divisionCommunicationEmployee); + } catch (BonzomsException eee) { + fail("BonzomsException : " + eee.getMessage()); + } + + try { + String res = serviceXpil.find(String.class, personId); + + log.info(res); + + } catch (Exception eee) { + fail("Exception : " + eee.getMessage()); + } + + try { + servicePerson.deletePerson(personId); + serviceOrganization.deleteGroupPerson(organisation.getId()); + serviceOrganization.deleteGroupPerson(divisionInformatique.getId()); + serviceOrganization.deleteGroupPerson(divisionCommunication.getId()); + } catch (BonzomsException eee) { + fail("BonzomsException : " + eee.getMessage()); + } + + } + } \ No newline at end of file Modified: branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/bonzoms-business/src/test/java/org/chorem/bonzoms/impl/ServiceOrganizationImplTest.java 2009-08-26 10:24:20 UTC (rev 55) @@ -87,7 +87,7 @@ log.debug("TEST:: CREATE ORGANIZATION"); GroupPerson groupPerson = testCreateOrganization(serviceOrganization, "Code Lutin !"); - log.debug("TEST:: CREATE PERSON"); + /*log.debug("TEST:: CREATE PERSON"); Person person = servicePerson.getNewPerson(); person.setFirstName("Arnaud"); person.setLastName("Thimel"); @@ -121,8 +121,13 @@ } String idRel = rel.getId(); - assertNotNull(idRel); - + assertNotNull(idRel);*/ + + Relationship rel = + addEmployee(servicePerson, serviceOrganization, "Arnaud", "Thimel", createDate(13,3,2009), createDate(13,12,2009), groupPerson); + String idRel = rel.getId(); + String idPerson = rel.getParty().getId(); + try { List<Relationship> relations = serviceOrganization.getAllRelationships(groupPerson); @@ -174,7 +179,7 @@ } - GroupPerson testCreateOrganization(ServiceOrganization service, String organizationName) { + public static GroupPerson testCreateOrganization(ServiceOrganization service, String organizationName) { GroupPerson organization = service.getNewOrganization(); organization.setName(organizationName); try { @@ -188,6 +193,42 @@ return organization; } + public static Relationship addEmployee(ServicePerson servicePerson, ServiceOrganization serviceOrganization, String personFirstName, + String personLastName, Date fromDate, Date thruDate, GroupPerson employer) { + log.debug("TEST:: CREATE PERSON"); + Person person = servicePerson.getNewPerson(); + person.setFirstName(personFirstName); + person.setLastName(personLastName); + + try { + servicePerson.createUpdatePerson(person); + assertNotNull(person.getId()); + } catch (BonzomsException eee) { + log.debug("createUpdatePerson error"); + fail("BonzomsException"); + } + + log.debug("TEST:: ADD EMPLOYEE"); // CREATION DES ROLES + + Relationship rel = new Relationship(); + rel.setFromDate(fromDate); + rel.setThruDate(thruDate); + + rel.setParty(person); + rel.setPartyParent(employer); + rel.setType(RelationshipTypeValues.EMPLOYMENT); + + try { + serviceOrganization.addEmployee(rel); + assertNotNull(rel.getId()); + } catch (BonzomsException eee) { + log.debug("addEmployee error"); + fail("BonzomsException"); + } + + return rel; + } + @Test public void testDivisionRelationships() { log.info("addDivision"); @@ -247,9 +288,9 @@ GroupPerson company = testCreateOrganization(service, "Code Lutin !"); log.debug("TEST:: ADD DIVISION : " + divisionName); - String id = testAddDivision(service, divisionName, company, createDate(18,5,2009), null); + GroupPerson division = testAddDivision(service, divisionName, company, createDate(18,5,2009), null); - assertNotNull(id); + assertNotNull(division.getId()); try { log.debug("TEST:: GET DIVISION NAMES START WITH : In"); @@ -266,7 +307,7 @@ log.debug("TEST:: NETTOYAGE"); try { service.deleteGroupPerson(company.getId()); - service.deleteGroupPerson(id); + service.deleteGroupPerson(division.getId()); } catch (BonzomsException eee) { log.debug("deleteGroupPerson error"); fail("BonzomsException"); @@ -281,7 +322,7 @@ * @param fromDate * @param thruDate */ - String testAddDivision(ServiceOrganization service, String divisionName, GroupPerson company, Date fromDate, Date thruDate) { + public static GroupPerson testAddDivision(ServiceOrganization service, String divisionName, GroupPerson company, Date fromDate, Date thruDate) { Relationship rel = service.getNewDivisionRelation(); rel.setFromDate(fromDate); rel.setThruDate(thruDate); @@ -293,7 +334,7 @@ log.debug("addDivision error"); fail("BonzomsException"); } - return rel.getParty().getId(); + return (GroupPerson) rel.getParty(); } /** Modified: branches/1.0.0-rc-3-memberships-xpil/pom.xml =================================================================== --- branches/1.0.0-rc-3-memberships-xpil/pom.xml 2009-08-25 16:51:29 UTC (rev 54) +++ branches/1.0.0-rc-3-memberships-xpil/pom.xml 2009-08-26 10:24:20 UTC (rev 55) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <groupId>org.chorem</groupId> @@ -133,8 +133,8 @@ <properties>  - <topia.version>2.2.0-rc-5-SNAPSHOT</topia.version> - <generator.version>1.0.0-rc-3</generator.version> + <topia.version>2.2.0</topia.version> + <generator.version>1.0.0</generator.version> <jrst.version>1.0.0</jrst.version>  @@ -180,60 +180,7 @@ <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/bonzoms/trunk</developerConnection> <url>http://www.chorem.org/repositories/browse/bonzoms/trunk</url> </scm> - - <issueManagement> - <system>redmine</system> - <url>http://www.chorem.org/projects/bonzoms/issues</url> - </issueManagement> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.chorem.org</url> - </ciManagement> - -  - <mailingLists> - <mailingList> - <name>bonzoms-commits</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-commits</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-commits</unsubscribe> - <post>bonzoms-commits(a)$list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/bonzoms-commits/</archive> - </mailingList> - - <mailingList> - <name>bonzoms-devel</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-devel</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-devel</unsubscribe> - <post>bonzoms-devel(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/bonzoms-devel/</archive> - </mailingList> - - <mailingList> - <name>bonzoms-users</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-users</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/bonzoms-users</unsubscribe> - <post>bonzoms-users(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/bonzoms-users/</archive> - </mailingList> - </mailingLists> - -  - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/bonzoms</url> - </site> - </distributionManagement> - + <repositories>  <repository>

1 0

r54 - in branches: . 1.0.0-rc-3-memberships-xpil
by fdesbois＠users.chorem.org Aug. 25, 2009

Aug. 25, 2009

Author: fdesbois Date: 2009-08-25 18:51:29 +0200 (Tue, 25 Aug 2009) New Revision: 54 Added: branches/1.0.0-rc-3-memberships-xpil/ Log: Create branche for add memberships support in xpil format Property changes on: branches/1.0.0-rc-3-memberships-xpil ___________________________________________________________________ Added: svn:ignore + target nbactions.xml Added: svn:mergeinfo +

1 0

r53 - trunk/bonzoms-business/src/site/rst/developper
by fdesbois＠users.chorem.org Aug. 25, 2009

Aug. 25, 2009

Author: fdesbois Date: 2009-08-25 18:49:18 +0200 (Tue, 25 Aug 2009) New Revision: 53 Modified: trunk/bonzoms-business/src/site/rst/developper/topia.rst Log: documentation for Topia finished Modified: trunk/bonzoms-business/src/site/rst/developper/topia.rst =================================================================== --- trunk/bonzoms-business/src/site/rst/developper/topia.rst 2009-08-24 08:46:28 UTC (rev 52) +++ trunk/bonzoms-business/src/site/rst/developper/topia.rst 2009-08-25 16:49:18 UTC (rev 53) @@ -114,7 +114,7 @@ Voici le diagramme qui permet de générer les entités de Bonzoms : .. image:: ../schemas/ClassDiagram_Entities_generation.png - :alt: Modèle du domaine - Entités de Bonzoms + :alt: Modèle pour génération des entités :align: center Classes vertes : pas de génération des classes DAOImpl et Impl @@ -126,15 +126,107 @@ BeanGenerator ------------- -DTO Generation +Le BeanGenerator permet la génération des DTO. Les DTO sont générés comme des Beans. Pour garder une cohérence avec les entités, il est possible d'utiliser les +dépendances UML entre un DTO et son entité. Ainsi le DTO aura directement tous les attributs primitifs (double, int, String, Date, ...) de l'entité qu'il dépend. +Il est possible également de rendre dépendant un DTO de plusieurs entités (principalement utilisé pour l'héritage). -- Dependances -- Convert -- TopiaId +Des utilitaires de Chorem-commons sont utilisés pour faciliter la conversion des DTO en Entité et vice et versa. Via le ServiceHelper, les ajout/modifications +sur une entité se font via une Map de propriétés qui sera passer aux DAO pour ToPIA. Cette Map reprend les attributs de l'entité. Pour la conversion des entités en DTO, +l'utilitaire Convert est utilisé. Ainsi les valeurs des attributs communs aux deux (DTO et entité) comme l'indique la dépendance se feront automatiquement. Les +attributs rajoutés spécifiquement au DTO sont à la charge du développeur. -Services Generation +Exemple ajout/modification via ServiceHelper :: -- ToPIA-SOA non utilise en runtime + ContactEntity entity = null; + if (contact != null && contact.getContact() != null && !contact.getContact().isEmpty()) { + // Helper pour la creation ou la recuperation de l'entite Type + ContactType contactType = + BonzomsTypeHelper.getTypeEntity(contact.getType(), ContactType.class, transaction, log); + TopiaDAO dao = null; + + Map<String, Object> existParams = new HashMap<String, Object>(); // Attributs pour l'existence d'un contact dans le cas d'un ajout (id = null) + Map<String, Object> saveParams = new HashMap<String, Object>(); // Attributs pour la sauvegarde de l'entité (ajout/modification) + + existParams.put(ContactEntity.CONTACT, contact.getContact()); + existParams.put(ContactEntity.CONTACT_TYPE, contactType); + + if (contactType.isAddress()) { // Particularité pour l'heritage (AddressEntity extends ContactEntity) + if (log.isDebugEnabled()) { + log.debug("ADDRESS contact"); + } + existParams.put(AddressEntity.CONTACT2,contact.getContact2()); + + CityEntity city = createOrGetCity(contact, transaction, log); + + existParams.put(AddressEntity.CITY_ENTITY,city); + + dao = BonzomsModelDAOHelper.getAddressEntityDAO(transaction); + } else { + dao = BonzomsModelDAOHelper.getContactEntityDAO(transaction); + } + + saveParams = new HashMap<String, Object>(existParams); + + // Appel du ServiceHelper + entity = ServiceHelper.createUpdateEntity(dao,contact.getId(),existParams,saveParams,log); + + // Mise a jour de l'id dans le DTO Contact via une conversion incluse dans le ContextUtilBonzoms + contact.setId(ContextUtilBonzoms.convertId(entity.getTopiaId())); + } else { + throw new IllegalArgumentException("Null Contact contact. Can't create or update null object or with an empty contact attribute"); + } + +Exemple conversion Entité en DTO via Convert :: + + boolean address = entity.getContactType().isAddress(); + // Important, les attributs d'une AddressEntity ne sont pas les memes que ceux d'un ContactEntity + Class interfaceClass = address ? AddressEntity.class : ContactEntity.class; + Contact result = Convert.toDTO(entity,interfaceClass,Contact.class); + + // Specific DTO attributes + result.setType(entity.getContactType().getName()); + result.setId(ContextUtilBonzoms.convertId(entity.getTopiaId())); + result.setEditable(false); // Used for Web Interface + if (address) { + CityEntity cityEntity = ((AddressEntity)entity).getCityEntity(); + if (cityEntity != null) { + result.setCity(cityEntity.getCity()); + result.setPostalCode(cityEntity.getPostalCode()); + result.setCountry(cityEntity.getCountryEntity().getCountry()); + } + } + +La conversion de l'identifiant se fait également via l'utilitaire Convert de Chorem-commons. Dans Bonzoms, on souhaite avoir un identifiant plus simple pour +les DTO afin de rendre plus lisible cet identifiant via Bonzoms-ui (l'identifiant visible dans l'url). ContextUtilBonzoms utilise la méthode *Convert.toWebId* +pour convertir un TopiaId en identifiant simple d'utilisation dans Bonzoms-ui (et donc dans Tapestry). La conversion inverse est automatique dans les méthodes +de ServiceHelper. Une contrainte apparaît, l'identifiant webId ne contient pas le nom de l'entité persistante (comme un TopiaId), ce qui implique l'utilisation +du DAO spécique à l'entité que l'on manipule. Il n'est plus possible d'utiliser un DAO générique pour le cas d'un héritage. Dans l'exemple précédent, la manipulation +d'une AddressEntity impose l'utilisation du AddressEntityDAO et non pas son DAO père ContactEntityDAO. Ceci afin de retrouver le bon TopiaId correspondant à +l'identifiant du DTO. + +Ex ids :: + + webId = K1250241238968K0.6667881086684239 + topiaId = org.chorem.bonzoms.persistence.AddressEntity#1250241238968#0.6667881086684239 + +Voici le diagramme qui permet de générer les dtos de Bonzoms (Entités en Vert et DTO en Jaune) : + +.. image:: ../schemas/ClassDiagram_DTO.png + :alt: Modèle pour la génération des DTO + :align: center + + +TopiaApplicationServiceMetaGenerator +------------------------------------ + +Le TopiaApplicationServiceMetaGenerator provient de ToPIA-SOA qui permet la génération d'interfaces comme services. Le protocole de communication peut être +définit dans le fichier de configuration ContextBonzoms.properties. Pour le moment aucun tests n'a été fait pour permettre l'utilisation des services sur +un serveur distant (via RMI, XML-RPC ou SOAP). La génération est cependant effectuer pour une futur implémentation de la gestion distante. Les interfaces +doivent avoir le stéréotype **<<service>>**. + +Détails des `services`_ (inclut le diagramme permettant la génération). + +.. _services: ../user/services.html

1 0

r52 - in trunk: . bonzoms-business/src/site bonzoms-business/src/site/resources bonzoms-business/src/site/resources/css bonzoms-business/src/site/resources/schemas bonzoms-ui/src/site bonzoms-ui/src/site/resources/css src/site
by fdesbois＠users.chorem.org Aug. 24, 2009

Aug. 24, 2009

Author: fdesbois Date: 2009-08-24 10:46:28 +0200 (Mon, 24 Aug 2009) New Revision: 52 Added: trunk/bonzoms-business/src/site/resources/css/ trunk/bonzoms-business/src/site/resources/css/site.css Modified: trunk/bonzoms-business/src/site/resources/schemas/ClassDiagram_Services.png trunk/bonzoms-business/src/site/site.xml trunk/bonzoms-ui/src/site/resources/css/site.css trunk/bonzoms-ui/src/site/site.xml trunk/pom.xml trunk/src/site/site.xml Log: Change pom dependency and site.xml for mavenpom and jrst Added: trunk/bonzoms-business/src/site/resources/css/site.css =================================================================== --- trunk/bonzoms-business/src/site/resources/css/site.css (rev 0) +++ trunk/bonzoms-business/src/site/resources/css/site.css 2009-08-24 08:46:28 UTC (rev 52) @@ -0,0 +1,7 @@ +pre.literal_block { + border: 2px groove #FF4940; + background-color: #FFF1E1; + padding: 11px 11px 0; + font-family: monospace; + color: #58140B; +} \ No newline at end of file Modified: trunk/bonzoms-business/src/site/resources/schemas/ClassDiagram_Services.png =================================================================== (Binary files differ) Modified: trunk/bonzoms-business/src/site/site.xml =================================================================== --- trunk/bonzoms-business/src/site/site.xml 2009-08-21 08:34:14 UTC (rev 51) +++ trunk/bonzoms-business/src/site/site.xml 2009-08-24 08:46:28 UTC (rev 52) @@ -2,21 +2,10 @@ <project name="Bonzoms-business"> <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> - </skin> <bannerLeft> <name>${project.name}</name> </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> <body> Modified: trunk/bonzoms-ui/src/site/resources/css/site.css =================================================================== --- trunk/bonzoms-ui/src/site/resources/css/site.css 2009-08-21 08:34:14 UTC (rev 51) +++ trunk/bonzoms-ui/src/site/resources/css/site.css 2009-08-24 08:46:28 UTC (rev 52) @@ -1,4 +1,4 @@ -pre { +pre.literal_block { border: 2px groove #FF4940; background-color: #FFF1E1; padding: 11px 11px 0; Modified: trunk/bonzoms-ui/src/site/site.xml =================================================================== --- trunk/bonzoms-ui/src/site/site.xml 2009-08-21 08:34:14 UTC (rev 51) +++ trunk/bonzoms-ui/src/site/site.xml 2009-08-24 08:46:28 UTC (rev 52) @@ -3,20 +3,9 @@ <publishDate format="dd/MM/yyyy"/> - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> - </skin> - <bannerLeft> <name>${project.name}</name> </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> <body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-21 08:34:14 UTC (rev 51) +++ trunk/pom.xml 2009-08-24 08:46:28 UTC (rev 52) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.chorem</groupId> @@ -135,8 +135,7 @@  <topia.version>2.2.0-rc-5-SNAPSHOT</topia.version> <generator.version>1.0.0-rc-3</generator.version> - <jrst.version>1.0.0-rc-4-SNAPSHOT</jrst.version> - <skin.version>1.0.0-rc-2-SNAPSHOT</skin.version> + <jrst.version>1.0.0</jrst.version>  <choreg.version>1.0.0-alpha-2-SNAPSHOT</choreg.version> @@ -154,6 +153,24 @@ <chenillekit.version>1.0.2</chenillekit.version> </properties> + <build> + <defaultGoal>install</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> +    Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-21 08:34:14 UTC (rev 51) +++ trunk/src/site/site.xml 2009-08-24 08:46:28 UTC (rev 52) @@ -3,22 +3,11 @@ <publishDate format="dd/MM/yyyy"/> - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-2-SNAPSHOT</version> - </skin> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://www.nuiton.org/projects/show/jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/>

1 0

r51 - in trunk/bonzoms-business/src: main/xmi site site/resources/schemas site/rst site/rst/developper
by fdesbois＠users.chorem.org Aug. 21, 2009

Aug. 21, 2009

Author: fdesbois Date: 2009-08-21 10:34:14 +0200 (Fri, 21 Aug 2009) New Revision: 51 Added: trunk/bonzoms-business/src/site/resources/schemas/ClassDiagram_Entities_generation.png Modified: trunk/bonzoms-business/src/main/xmi/bonzoms.zargo trunk/bonzoms-business/src/site/rst/developper/topia.rst trunk/bonzoms-business/src/site/rst/index.rst trunk/bonzoms-business/src/site/rst/specifications.rst trunk/bonzoms-business/src/site/site.xml Log: Add rst documentation Modified: trunk/bonzoms-business/src/main/xmi/bonzoms.zargo =================================================================== (Binary files differ) Added: trunk/bonzoms-business/src/site/resources/schemas/ClassDiagram_Entities_generation.png =================================================================== (Binary files differ) Property changes on: trunk/bonzoms-business/src/site/resources/schemas/ClassDiagram_Entities_generation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/bonzoms-business/src/site/rst/developper/topia.rst =================================================================== --- trunk/bonzoms-business/src/site/rst/developper/topia.rst 2009-08-20 16:33:24 UTC (rev 50) +++ trunk/bonzoms-business/src/site/rst/developper/topia.rst 2009-08-21 08:34:14 UTC (rev 51) @@ -1,10 +1,131 @@ -Topia +Génération avec ToPIA +===================== -Entites Generation +:Author: $Author: fdesbois $ +:Version: 1.0 +:Revision: $Revision: 47 $ +:Date: $Date: 2009-08-19 19:01:06 +0200 (Wed, 19 Aug 2009) $ -- DAO -- Impl +*Created by fdesbois on 2009-08-19* +Topia est le framework principal pour le module Bonzoms-business. Il permet de générer les entités, les daos, les dtos et les services. Les transactions topia +sont également utilisés pour permettre de se connecter à une base de données pour la persistance des entités. Ainsi les services utilisent les daos pour +ajouter/modifier/supprimer et sélectionner les entités persistantes de la base de données. Cette dernière est configurable dans le fichier ContextBonzoms.properties :: + + hibernate.hbm2ddl.auto=update + hibernate.show_sql=false + + hibernate.dialect=org.hibernate.dialect.H2Dialect + hibernate.connection.username=sa + hibernate.connection.password= + hibernate.connection.driver_class=org.h2.Driver + hibernate.connection.url=jdbc:h2:file:~/h2data/bonzoms + +Actuellement, le fichier de propriétés par défaut utilise une base de données de type H2. Il est possible d'utiliser un autre fichier de propriétés au moment +de l'exécution de l'application. Ce fichier devra s'appeler **ContextBonzoms.properties** et être placé dans le dossier /etc de votre machine. + +.. _maven-eugene-plugin: http://maven-site.nuiton.org/eugene/maven-eugene-plugin/index.html + +Voici la configuration du plugin maven pour la génération des classes javas (`maven-eugene-plugin`_ ) :: + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> +  + <configuration> + <addCompileDirectory>true</addCompileDirectory> + <includes>**/*.objectmodel</includes> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.BeanGenerator, + org.nuiton.topia.generator.TopiaApplicationServiceMetaGenerator</templates> + <defaultPackage>${project.groupId}</defaultPackage> + <fullPackagePath>${project.groupId}</fullPackagePath> + <extractedPackages>${project.groupId}</extractedPackages> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-soa</artifactId> + <version>${topia.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-java5</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </plugin> + +Comme vous pouvez le constater dans les *goals*, trois étapes de génération sont effectuées : + +- zargo2xmi : Extraction du fichier XMI du modèle zargo (créer via `ArgoUML 0.28`_ ). Le fichier zargo est placé dans le dossier *src/main/xmi*. + +- xmi2objectmodel : Création d'un fichier *objectmodel* depuis le fichier xmi (utilisation de la librairie `EUGene`_ ). Ce fichier est généré dans le dossier + *target/generated-sources/models* + +- generate : Génération via ToPIA des fichiers pour les entités, les daos, les dtos et les services. Les fichiers sont générés dans le dossier + *target/generated-sources/java*. Ce sont les trois générateurs utilisés qui permettent les différentes générations. + +.. _ArgoUML 0.28: http://argouml.tigris.org/ + +.. _EUGene: http://maven-site.nuiton.org/eugene/eugene/index.html + +Note + L'exclusion de xfire évite un conflit lors de l'utilisation de topia-soa. + +TopiaMetaGenerator +------------------ + +Le TopiaMetaGenerator inclus dans ToPIA-persistence permet la génération des entités et daos. Pour chaque entité du modèle avec le stéréotype **<<entity>>** 7 fichiers sont générés. +Prenons l'exemple pour l'entité nommé *ContactEntity* : + +- ContactEntity.java : Interface représentant l'entité. Elle comprend les attributs et méthodes décrits dans le modèle UML + les accesseurs générés pour chaque attribut. + Elle comprend aussi des constantes statiques représentant le nom des attributs existants. Pour ContactEntity nous avons un seul champs, le champs *contact*. + +- ContactEntityAbstract.java : Classe abstraite implémentant les méthodes générés dans l'interface. Seul les méthodes non écrite dans le modèle UML sont implémentés. + +- ContactEntityImpl.java : Classe héritant de la classe abstraite précédente et implémentant l'interface de l'entité. Cette classe est généré uniquement si aucune + méthodes sont écrites dans l'entité dans le modèle UML. En effet ces méthodes devront être implémentés par le développeur et la classe devra être créé dans le + package **org.chorem.bonzoms.persistence**. (Vous pouvez trouver un exemple pour l'entité *PartyEntity* -> PartyEntityImpl). + +- ContactEntityImpl.hbm.xml : Fichier de mapping hibernate pour l'entité. + +- ContactEntityDAO.java : Final class du DAO (Data Access Object) pour manipulation des entités (create, update, delete, find, findAll, ...). Hérite de ContactEntityDAOImpl. + +- ContactEntityDAOAbstract.java : Classe abstraite du DAO avec implémentation des méthodes spécifiques à l'entité. + +- ContactEntityDAOImpl.java : Herite de la classe abstraite et permet la surcharge ou l'ajout de méthodes pour le DAO. Cette classe est vide par défaut et peut + ne pas être généré si l'entité sur le diagramme possède des méthodes avec le stéréotype **<<dao>>** + +La génération respecte l'héritage. Ainsi il est possible de manipuler les DAO d'une classe père pour trouver des fils (Ex : PartyEntityDAO). + +Voici le diagramme qui permet de générer les entités de Bonzoms : + +.. image:: ../schemas/ClassDiagram_Entities_generation.png + :alt: Modèle du domaine - Entités de Bonzoms + :align: center + +Classes vertes : pas de génération des classes DAOImpl et Impl + +Classes jaunes : pas de génération de la classe Impl + +Classes roses : pas de génération de la classe DAOImpl + +BeanGenerator +------------- + DTO Generation - Dependances Modified: trunk/bonzoms-business/src/site/rst/index.rst =================================================================== --- trunk/bonzoms-business/src/site/rst/index.rst 2009-08-20 16:33:24 UTC (rev 50) +++ trunk/bonzoms-business/src/site/rst/index.rst 2009-08-21 08:34:14 UTC (rev 51) @@ -1 +1,46 @@ -Index \ No newline at end of file +Sommaire +======== + +Bonzoms est une application permettant la gestion des personnes, sociétés, leurs relations, rôles et contacts. + +Ce site regroupe les documentations utilisateur et développeur du module maven Bonzoms-business. + +Ce module contient la gestion métier de Bonzoms : implémentation des services, gestion de la persistance via ToPIA. + +Vous pouvez vous rendre sur la page de présentation de Bonzoms : `ici`_ . Ou allez voir les spécifications : `la`_ . + +.. _ici: presentation.html + +.. _la: specifications.html + +Documentation utilisateur : + +- Descriptions en détails des `services`_ de Bonzoms. + +- Format des données pouvant être `exportees`_ (utilisation du standard Oasis CIQ). + +- Les `relations`_ et rôles existants par défaut dans l'application Bonzoms. + +- La `FAQ`_ + +.. _services: user/services.html + +.. _exportees: user/export.html + +.. _relations: user/relations.html + +.. _FAQ: user/faq.html + +Documentation développeur : + +- `Organisation`_ du projet Bonzoms. + +- Utilisation de `ToPIA`_ pour la génération des classes java (entités, daos, dtos et services) + +- Utilisation de `ChoReg`_ pour l'export des données + +.. _Organisation: developper/organisation.html + +.. _ToPIA: developper/topia.html + +.. _ChoReg: developper/choreg.html Modified: trunk/bonzoms-business/src/site/rst/specifications.rst =================================================================== --- trunk/bonzoms-business/src/site/rst/specifications.rst 2009-08-20 16:33:24 UTC (rev 50) +++ trunk/bonzoms-business/src/site/rst/specifications.rst 2009-08-21 08:34:14 UTC (rev 51) @@ -1,5 +1,5 @@ Spécifications de Bonzoms -======================== +========================= :Author: $Author$ :Version: 1.0 @@ -58,7 +58,7 @@ Pour plus de détails techniques sur les dtos voir la documentation sur l'utilisation de `ToPIA`_. -.. _dto: developper/topia.html +.. _ToPIA: developper/topia.html Services -------- Modified: trunk/bonzoms-business/src/site/site.xml =================================================================== --- trunk/bonzoms-business/src/site/site.xml 2009-08-20 16:33:24 UTC (rev 50) +++ trunk/bonzoms-business/src/site/site.xml 2009-08-21 08:34:14 UTC (rev 51) @@ -29,6 +29,7 @@ <menu name="Utilisateur"> <item name="Services" href="user/services.html" /> <item name="Export" href="user/export.html" /> + <item name="Gestion des relations" href="user/relations.html" /> <item name="FAQ" href="user/faq.html" /> </menu> @@ -42,6 +43,7 @@ <menu name="Liens"> <item name="ToPIA" href="http://nuiton.org/embedded/topia/topia-persistence/index.html" title="Documentation ToPIA" /> + <item name="ArgoUML" href="http://argouml.tigris.org/" title="ArgoUML" /> <item name="ChoReg" href="http://chorem.org/embedded/choreg/choreg" title="Documentation ChoReg" /> <item name="OASIS CIQ" href="http://www.oasis-open.org/committees/ciq/" title="Standard Oasis CIQ" /> <item name="OASIS CIQ Api" href="http://chorem.org/embedded/choreg/oasis-ciq-api" title="Documentation Oasis CIQ Api" />

1 0

r50 - trunk/bonzoms-business/src/test/resources
by fdesbois＠users.chorem.org Aug. 20, 2009

Aug. 20, 2009

Author: fdesbois Date: 2009-08-20 18:33:24 +0200 (Thu, 20 Aug 2009) New Revision: 50 Modified: trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties Log: Change h2data destination to target folder Modified: trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties =================================================================== --- trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties 2009-08-19 17:08:48 UTC (rev 49) +++ trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties 2009-08-20 16:33:24 UTC (rev 50) @@ -6,4 +6,4 @@ hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:~/h2data/test/bonzoms \ No newline at end of file +hibernate.connection.url=jdbc:h2:file:target/h2data/bonzoms \ No newline at end of file

1 0

r49 - trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export
by fdesbois＠users.chorem.org Aug. 19, 2009

Aug. 19, 2009

Author: fdesbois Date: 2009-08-19 19:08:48 +0200 (Wed, 19 Aug 2009) New Revision: 49 Modified: trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java Log: Change target for xml test Modified: trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java =================================================================== --- trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java 2009-08-19 17:01:38 UTC (rev 48) +++ trunk/bonzoms-business/src/test/java/org/chorem/bonzoms/export/FormatXPILTest.java 2009-08-19 17:08:48 UTC (rev 49) @@ -62,6 +62,10 @@ @BeforeClass public static void setUpClass() throws Exception { + File dir = new File("target/xml"); + if (!dir.exists()) { + dir.mkdir(); + } } @AfterClass @@ -109,9 +113,9 @@ PartyDocument result = FormatXPIL.getDocument(personEntity, ServicePerson.class); assertTrue(result.validate()); - + try { - result.save(new File("person.xml")); + result.save(new File("target/xml/person.xml")); } catch (IOException eee) { log.error("Error in save", eee); fail("IOException");

1 0