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> <!-- Nuiton librairies --> - <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> <!-- ChoReg --> @@ -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> - - <!--Any mailing lists for the project--> - <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@$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@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@list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/bonzoms-users/</archive> - </mailingList> - </mailingLists> - - <!--Distribution--> - <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> <!-- depot des releases nuiton --> <repository>