February 2010 - Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r335 - in trunk/suiviobsmer-business/src: main/filters test/java/fr/ifremer/suiviobsmer/impl test/resources/import
by fdesbois＠users.labs.libre-entreprise.org 08 Feb '10

08 Feb '10

Author: fdesbois Date: 2010-02-08 14:34:32 +0000 (Mon, 08 Feb 2010) New Revision: 335 Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv Log: Add test for sampleRow comment Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties =================================================================== --- trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-02-08 13:55:53 UTC (rev 334) +++ trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-02-08 14:34:32 UTC (rev 335) @@ -17,4 +17,4 @@ suiviobsmer.email.from=admin at wao.org ## Version -suiviobsmer.version=0.4.0 \ No newline at end of file +suiviobsmer.version=1.0.0 \ No newline at end of file Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-02-08 13:55:53 UTC (rev 334) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-02-08 14:34:32 UTC (rev 335) @@ -498,6 +498,7 @@ assertNotNull(row1); assertEquals(1, row1.getNbObservants()); assertEquals(1.5, row1.getAverageTideTime(), 0.1); + assertEquals("Un petit commentaire", row1.getComment()); assertEquals("MA-2009", row1.getProgramName()); Modified: trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv 2010-02-08 13:55:53 UTC (rev 334) +++ trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv 2010-02-08 14:34:32 UTC (rev 335) @@ -1,5 +1,5 @@ "PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT" -"2010_1",TARTANPION,"IId / I",,"DB_MOL",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1, +"2010_1",TARTANPION,"IId / I",,"DB_MOL",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire" "2010_2",,"IId",,"GTR_DEAEF et ANS_DEF",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1, "2010_03",,"IId / IV",,"ORM",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1, "2009_1",,"IId / IV",,"GTR_DEF et GNS_DEF","110-119",,,"Fileyage à poissons tubes","poissons plats","PPP2010",12/2009,10/2010,0,1,1,1,2,1,1,1,1,1,2,,,,,,1,1,

1 0

[Suiviobsmer-commits] r334 - in trunk: . suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl
by fdesbois＠users.labs.libre-entreprise.org 08 Feb '10

08 Feb '10

Author: fdesbois Date: 2010-02-08 13:55:53 +0000 (Mon, 08 Feb 2010) New Revision: 334 Modified: trunk/changelog.txt trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java Log: Ano #2096 : Missing text for the mail when the user password is changed Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-02-08 13:45:42 UTC (rev 333) +++ trunk/changelog.txt 2010-02-08 13:55:53 UTC (rev 334) @@ -24,6 +24,8 @@ Anomalies +++++++++ +- [fdesbois] Ano #2096 : Administration : Format mail suite changement mot de + passe - [fdesbois] Ano #2095 : Administration : Les zones de pêche ayant le même code de division ne sont pas écrasées à l'import - [fdesbois] Ano #1992 : Session : Problème d'instanciation sur User lors de Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-02-08 13:45:42 UTC (rev 333) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-02-08 13:55:53 UTC (rev 334) @@ -189,9 +189,16 @@ "\t\t * mot de passe = " + password + "\n\n" + "Vous pouvez modifier votre mot de passe en accédant à la page de gestion de votre profil utilisateur:\n\n" + "\t\thttp://" + SuiviObsmerContext.getProperty(SuiviObsmerContext.PROP_SERVER) + "\n\n"; - } else if (generatePassword) { + } else { subject += "Modification de votre compte"; - msg += "\tVotre mot de passe de connexion à l'application WAO a été modifié : " + password + "\n\n"; + if (generatePassword) { + msg += "\tVotre mot de passe de connexion à l'application WAO a été modifié : " + password + "\n\n"; + } else { + msg += "\tVotre changement de mot de passe à bien été enregistré.\n" + + "Pour des raisons de sécurité, le nouveau mot de passe n'est pas précisé dans ce message.\n" + + "Vous pouvez faire une nouvelle demande de mot de passe en cas de perte sur la page de connexion ou en " + + "répondant à ce message.\n\n"; + } } msg += "Cordialement,\n\n" + "L'Equipe WAO";

1 0

[Suiviobsmer-commits] r333 - in trunk: . suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl
by fdesbois＠users.labs.libre-entreprise.org 08 Feb '10

08 Feb '10

Author: fdesbois Date: 2010-02-08 13:45:42 +0000 (Mon, 08 Feb 2010) New Revision: 333 Modified: trunk/changelog.txt trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java Log: Ano #2095 : Update existing fishingZone when import is done Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-02-05 18:25:46 UTC (rev 332) +++ trunk/changelog.txt 2010-02-08 13:45:42 UTC (rev 333) @@ -9,7 +9,7 @@ Evolutions ++++++++++ -- [fdesbois] Evo #2080 ; Plan d'échantillonnage : bulle d'aide manquante pour +- [fdesbois] Evo #2080 : Plan d'échantillonnage : bulle d'aide manquante pour liste navires éligibles. - [fdesbois] Evo #2075 : Plan d'échantillonnage : Ajouter colonne commentaire - [fdesbois] Evo #2085 : Navires : Changement texte confidentialité dans page @@ -24,6 +24,8 @@ Anomalies +++++++++ +- [fdesbois] Ano #2095 : Administration : Les zones de pêche ayant le même + code de division ne sont pas écrasées à l'import - [fdesbois] Ano #1992 : Session : Problème d'instanciation sur User lors de la perte de la session Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2010-02-05 18:25:46 UTC (rev 332) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2010-02-08 13:45:42 UTC (rev 333) @@ -187,18 +187,14 @@ String sectorName = reader.get(FISHING_ZONE.PECHE_ZONE.name()).trim(); String districtCode = reader.get(FISHING_ZONE.PECHE_DIVISION.name()).trim(); - FishingZone zone = dao.findByProperties( - FishingZone.FACADE_NAME, facadeName, - FishingZone.SECTOR_NAME, sectorName, - FishingZone.DISTRICT_CODE, districtCode); + FishingZone zone = dao.findByDistrictCode(districtCode); if (zone == null) { - zone = dao.create( - FishingZone.FACADE_NAME, facadeName, - FishingZone.SECTOR_NAME, sectorName, - FishingZone.DISTRICT_CODE, districtCode); - result++; + zone = dao.create(FishingZone.DISTRICT_CODE, districtCode); } + zone.setFacadeName(facadeName); + zone.setSectorName(sectorName); + result++; } transaction.commitTransaction();

1 0

[Suiviobsmer-commits] r332 - trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl
by fdesbois＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: fdesbois Date: 2010-02-05 18:25:46 +0000 (Fri, 05 Feb 2010) New Revision: 332 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java Log: Use BETWEEN instead of <= and >= in query Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-05 18:10:00 UTC (rev 331) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-05 18:25:46 UTC (rev 332) @@ -357,11 +357,9 @@ String tideBeginDateKey = contactKey + "." + Contact.TIDE_BEGIN_DATE; String createDateKey = contactKey + "." + TopiaEntity.TOPIA_CREATE_DATE; query.add("(" + tideBeginDateKey + " IS NOT NULL " + - "AND " + tideBeginDateKey + " >= :fromDate " + - "AND " + tideBeginDateKey + " <= :thruDate)" + + "AND " + tideBeginDateKey + " BETWEEN :fromDate AND :thruDate)" + " OR (" + tideBeginDateKey + " IS NULL " + - "AND " + createDateKey + " >= :fromDate " + - "AND " + createDateKey + " <= :thruDate)"); + "AND " + createDateKey + " BETWEEN :fromDate AND :thruDate)"); query.addParam("fromDate", period.getFromDate()). addParam("thruDate", period.getThruDate());

1 0

[Suiviobsmer-commits] r331 - in trunk: . suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/xmi suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl
by fdesbois＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: fdesbois Date: 2010-02-05 18:10:00 +0000 (Fri, 05 Feb 2010) New Revision: 331 Added: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactStateStatisticsImpl.java Modified: trunk/changelog.txt trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java Log: Evo #1986 : Add indicator for contact states (business only) Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-02-05 14:04:29 UTC (rev 330) +++ trunk/changelog.txt 2010-02-05 18:10:00 UTC (rev 331) @@ -1,6 +1,8 @@ Release note ============ +Historique des versions + 1.0.0 ----- @@ -24,6 +26,16 @@ - [fdesbois] Ano #1992 : Session : Problème d'instanciation sur User lors de la perte de la session + +0.4.1 +----- + +Evolutions +++++++++++ + +Anomalies ++++++++++ + - [fdesbois] Ano #2073 : Contacts : Erreur tableau contact sur commentaire refus 0.4.0 Added: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactStateStatisticsImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactStateStatisticsImpl.java (rev 0) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactStateStatisticsImpl.java 2010-02-05 18:10:00 UTC (rev 331) @@ -0,0 +1,48 @@ + +package fr.ifremer.suiviobsmer.bean; + +import fr.ifremer.suiviobsmer.entity.Company; +import java.util.HashMap; +import java.util.Map; + +/** + * ContactStateStatisticsImpl + * + * Created: 5 févr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ContactStateStatisticsImpl extends ContactStateStatistics { + + @Override + public void addResult(String state, int nbResults) { + + ContactState stateEnum = ContactState.createContactStateEnum(state); + getData().put(stateEnum, nbResults); + + total += nbResults; + } + + @Override + public Map<ContactState, Integer> getData() { + if (data == null) { + data = new HashMap<ContactState, Integer>(); + + // Initialize all contact states + for (ContactState state : ContactState.values()) { + data.put(state, 0); + } + } + return data; + } + + @Override + public boolean isDefined() { + return total != 0; + } + +} Property changes on: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactStateStatisticsImpl.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-05 14:04:29 UTC (rev 330) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-05 18:10:00 UTC (rev 331) @@ -26,6 +26,8 @@ import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper; import fr.ifremer.suiviobsmer.bean.BoardingResult; import fr.ifremer.suiviobsmer.bean.BoardingResultImpl; +import fr.ifremer.suiviobsmer.bean.ContactStateStatistics; +import fr.ifremer.suiviobsmer.bean.ContactStateStatisticsImpl; import fr.ifremer.suiviobsmer.bean.SamplingFilter; import fr.ifremer.suiviobsmer.entity.Boat; import fr.ifremer.suiviobsmer.entity.Company; @@ -34,10 +36,12 @@ import fr.ifremer.suiviobsmer.entity.SampleMonth; import fr.ifremer.suiviobsmer.entity.SampleMonthDAO; import fr.ifremer.suiviobsmer.entity.SampleRow; +import fr.ifremer.suiviobsmer.entity.WaoUser; import fr.ifremer.suiviobsmer.services.ServiceSynthesis; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; @@ -48,6 +52,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaQuery.Op; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -324,4 +329,82 @@ return results; } + @Override + public Collection<ContactStateStatistics> getContactStateStatistics(Company company, PeriodDates period) throws SuiviObsmerException { + TopiaContext transaction = null; + Map<Company, ContactStateStatistics> results = new HashMap<Company, ContactStateStatistics>(); + try { + transaction = rootContext.beginTransaction(); + + ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction); + + // Only for contacts not refused by the program + String contactKey = "C"; + String validationProgramKey = contactKey + "." + Contact.VALIDATION_PROGRAM; + TopiaQuery<Contact> query = dao.createQuery(contactKey). + add(validationProgramKey + " IS NULL " + + "OR " + validationProgramKey + " = :booleanTrue"). + addParam("booleanTrue", Boolean.TRUE); + + String companyKey = contactKey + "." + Contact.OBSERVER + "." + WaoUser.COMPANY; + + if (company != null) { + query.add(companyKey, company); + } + + if (period != null) { + // Contacts include in the period + String tideBeginDateKey = contactKey + "." + Contact.TIDE_BEGIN_DATE; + String createDateKey = contactKey + "." + TopiaEntity.TOPIA_CREATE_DATE; + query.add("(" + tideBeginDateKey + " IS NOT NULL " + + "AND " + tideBeginDateKey + " >= :fromDate " + + "AND " + tideBeginDateKey + " <= :thruDate)" + + " OR (" + tideBeginDateKey + " IS NULL " + + "AND " + createDateKey + " >= :fromDate " + + "AND " + createDateKey + " <= :thruDate)"); + + query.addParam("fromDate", period.getFromDate()). + addParam("thruDate", period.getThruDate()); + } + + String stateKey = contactKey + "." + Contact.STATE; + query.addGroup(companyKey).addGroup(stateKey). + addOrder(companyKey). + setSelect(companyKey).addSelect(stateKey).addSelect("COUNT(*)"); + + if (log.isDebugEnabled()) { + log.debug("Exec query : " + query); + } + + List<Object[]> res = query.execute(); + + for (Object[] row : res) { + Company rowCompany = (Company)row[0]; + String rowState = (String)row[1]; + Long rowCount = (Long)row[2]; + if (log.isDebugEnabled()) { + log.debug("res : " + rowCompany.getName() + " _ " + rowState + " _ " + rowCount); + } + ContactStateStatistics stats = results.get(rowCompany); + if (stats == null) { + stats = new ContactStateStatisticsImpl(); + stats.setCompany(rowCompany); + results.put(rowCompany, stats); + } + stats.addResult(rowState, rowCount.intValue()); + } + + transaction.closeContext(); + } catch (Exception eee) { + String msgEnd = ""; + if (company != null) { + msgEnd = " pour la société " + company.getName(); + } + SuiviObsmerContext.serviceException(transaction, + "Impossible de récupérer les statistiques sur les états des " + + "contacts " + msgEnd, eee); + } + return results.values(); + } + } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java 2010-02-05 14:04:29 UTC (rev 330) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java 2010-02-05 18:10:00 UTC (rev 331) @@ -7,6 +7,7 @@ import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest; import fr.ifremer.suiviobsmer.bean.BoardingResult; import fr.ifremer.suiviobsmer.bean.ContactState; +import fr.ifremer.suiviobsmer.bean.ContactStateStatistics; import fr.ifremer.suiviobsmer.entity.Boat; import fr.ifremer.suiviobsmer.entity.Company; import fr.ifremer.suiviobsmer.entity.CompanyDAO; @@ -21,9 +22,11 @@ import fr.ifremer.suiviobsmer.services.ServiceReferential; import fr.ifremer.suiviobsmer.services.ServiceSampling; import java.io.InputStream; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.commons.collections.CollectionUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -31,6 +34,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.util.DateUtils; +import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.Assert.*; @@ -273,4 +277,147 @@ assertEquals(1., value, 0); } + /** + * Test of getBoardingBoats method, of class ServiceSynthesisImpl. + */ + @Test + public void testGetContactStateStatistics() throws Exception { + log.info("getContactStateStatistics"); + /** PREPARE DATA **/ + InputStream input = getClass().getResourceAsStream("/import/navires.csv"); + ServiceBoat serviceBoat = new ServiceBoatImpl(); + serviceBoat.importBoatCsv(input); + List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258"); + Boat boat = boats.get(0); + + List<Boat> boats2 = serviceBoat.getBoatsByImmatriculations("177474"); + Boat boat2 = boats2.get(0); + + TopiaContext transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); + + CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); + Company company = companyDAO.create(Company.NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.NAME, "BIS"); + + WaoUserDAO userDAO = SuiviObsmerModelDAOHelper.getWaoUserDAO(transaction); + WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", + WaoUser.COMPANY, company); + company.addWaoUser(user); + WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", + WaoUser.COMPANY, company2); + company2.addWaoUser(user2); + + transaction.commitTransaction(); + + input = getClass().getResourceAsStream("/import/zonesPeche.csv"); + ServiceReferential serviceReferential = new ServiceReferentialImpl(); + serviceReferential.importFishingZoneCsv(input); + + input = getClass().getResourceAsStream("/import/echantillonnage.csv"); + ServiceSampling serviceSampling = new ServiceSamplingImpl(); + serviceSampling.importSamplingPlanCsv(input); + + SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); + SampleRow row = rowDAO.findByCode("2010_0001"); + + transaction.closeContext(); + + + ServiceContact serviceContact = new ServiceContactImpl(); + + // Contacts for company TARTANPION + Contact contact1 = new ContactImpl(); + contact1.setObserver(user); + contact1.setState(ContactState.BOARDING_DONE.toString()); + Date begin = DateUtils.createDate(3, 3, 2009); + contact1.setTideBeginDate(begin); + serviceContact.saveContact(contact1, false); + + Contact contact2 = new ContactImpl(); + contact2.setObserver(user); + contact2.setState(ContactState.BOARDING_DONE.toString()); + begin = DateUtils.createDate(3, 10, 2009); + contact2.setTideBeginDate(begin); + serviceContact.saveContact(contact2, false); + + Contact contact3 = new ContactImpl(); + contact3.setObserver(user); + contact3.setState(ContactState.BOAT_REFUSED.toString()); + begin = DateUtils.createDate(3, 5, 2009); + contact3.setTopiaCreateDate(begin); + serviceContact.saveContact(contact3, false); + + // Contacts for company BIS + Contact contact4 = new ContactImpl(); + contact4.setObserver(user2); + contact4.setState(ContactState.BOARDING_EXPECTED.toString()); + begin = DateUtils.createDate(3, 5, 2009); + contact4.setTopiaCreateDate(begin); + serviceContact.saveContact(contact4, false); + + Contact contact5 = new ContactImpl(); + contact5.setObserver(user2); + contact5.setState(ContactState.BOAT_UNAVAILABLE.toString()); + begin = DateUtils.createDate(3, 3, 2010); + contact5.setTopiaCreateDate(begin); + serviceContact.saveContact(contact5, false); + + // Contact refused by program, will not be in result + Contact contact6 = new ContactImpl(); + contact6.setObserver(user2); + contact6.setState(ContactState.BOAT_UNAVAILABLE.toString()); + begin = DateUtils.createDate(3, 3, 2010); + contact6.setTopiaCreateDate(begin); + contact6.setValidationProgram(Boolean.FALSE); + serviceContact.saveContact(contact6, false); + + /** EXEC METHOD **/ + + // result for company TARTANPION with no period + Collection<ContactStateStatistics> results = + service.getContactStateStatistics(company, null); + + assertEquals(1, results.size()); + ContactStateStatistics result = (ContactStateStatistics)CollectionUtils.get(results, 0); + assertEquals(3, result.getTotal()); + Map<ContactState, Integer> data = result.getData(); + assertNotNull(data); + + assertEquals(ContactState.values().length, data.size()); + assertEquals(2, data.get(ContactState.BOARDING_DONE).intValue()); + assertEquals(1, data.get(ContactState.BOAT_REFUSED).intValue()); + + // result for company BIS using admin mode + results = service.getContactStateStatistics(null, null); + assertEquals(2, results.size()); + + result = null; + for (ContactStateStatistics stats : results) { + if (stats.getCompany().equals(company2)) { + result = stats; + break; + } + } + + assertEquals(2, result.getTotal()); + data = result.getData(); + assertEquals(1, data.get(ContactState.BOARDING_EXPECTED).intValue()); + assertEquals(1, data.get(ContactState.BOAT_UNAVAILABLE).intValue()); + + // result for period 3/5/2009 to 3/10/2009 for BIS company + begin = DateUtils.createDate(3, 5, 2009); + Date end = DateUtils.createDate(31, 10, 2009); + PeriodDates period = new PeriodDates(begin, end); + + results = service.getContactStateStatistics(company2, period); + assertEquals(1, results.size()); + + result = (ContactStateStatistics)CollectionUtils.get(results, 0); + + assertEquals(1, result.getTotal()); + data = result.getData(); + assertEquals(1, data.get(ContactState.BOARDING_EXPECTED).intValue()); + assertEquals(0, data.get(ContactState.BOAT_UNAVAILABLE).intValue()); + } + } \ No newline at end of file

1 0

[Suiviobsmer-commits] r330 - in tags: . suiviobsmer-0.4.1 suiviobsmer-0.4.1/suiviobsmer-business suiviobsmer-0.4.1/suiviobsmer-ui
by fdesbois＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: fdesbois Date: 2010-02-05 14:04:29 +0000 (Fri, 05 Feb 2010) New Revision: 330 Added: tags/suiviobsmer-0.4.1/ tags/suiviobsmer-0.4.1/pom.xml tags/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml tags/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml Removed: tags/suiviobsmer-0.4.1/pom.xml tags/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml tags/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml Log: create tag for 0.4.1 Deleted: tags/suiviobsmer-0.4.1/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/pom.xml 2010-02-05 13:54:13 UTC (rev 327) +++ tags/suiviobsmer-0.4.1/pom.xml 2010-02-05 14:04:29 UTC (rev 330) @@ -1,361 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4labs</artifactId> - <version>2.0.4</version> - </parent> - - <groupId>fr.ifremer</groupId> - <artifactId>suiviobsmer</artifactId> - <version>0.4.1</version> - - <modules> - <module>suiviobsmer-ui</module> - <module>suiviobsmer-business</module> - </modules> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonutils.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> -  - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - <version>${topia.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestry.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - <version>${tapestry.version}</version> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - <version>1.2.0</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - </dependency> - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - <version>2.0</version> - </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.125</version> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc4</version> - </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> - </dependency> - -  -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - -  -  -  - - <name>SuiviObsmer</name> - <description>Application pour le suivi d'embarquements sur des bateaux de pêches dans le cadre - d'observations scientifiques.</description> - <inceptionYear>2009</inceptionYear> - - <organization> - <name>Ifremer</name> - <url>http://www.ifremer.fr/</url> - </organization> - -  - <developers> - <developer> - <id>fdesbois</id> - <name>Florian Desbois</name> - <email>fdesbois at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit at codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> - - <issueManagement> - <system>gforge</system> - <url>https://${platform}/tracker?group_id=${labs.id}</url> - </issueManagement> - -  -  -  - - <packaging>pom</packaging> - - <properties> - - <projectId>suiviobsmer</projectId> - <labs.id>154</labs.id> - -  - <nuitonutils.version>1.1.3</nuitonutils.version> - <topia.version>2.3.0-beta-7</topia.version> - <eugene.version>2.0.0-beta-4</eugene.version> - <tapestry.version>5.1.0.5</tapestry.version> - - </properties> - -  -  -  - - <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.0?root…</url> - </scm> - - <build> - - <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> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> - <configuration> - <inputs>zargo</inputs> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - </pluginManagement> - - </build> - -  -  -  - -  - <mailingLists> - - <mailingList> - <name>${projectId}-devel</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</unsubscribe> - <post>${projectId}-devel(a)${labs.list.host}</post> - <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> - </mailingList> - - </mailingLists> - - <repositories> - -  - - <repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - -  - - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - - </repositories> - - <pluginRepositories> - -  - - <pluginRepository> - - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> - -  - - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - - </pluginRepositories> - -</project> Copied: tags/suiviobsmer-0.4.1/pom.xml (from rev 329, branches/suiviobsmer-0.4.1/pom.xml) =================================================================== --- tags/suiviobsmer-0.4.1/pom.xml (rev 0) +++ tags/suiviobsmer-0.4.1/pom.xml 2010-02-05 14:04:29 UTC (rev 330) @@ -0,0 +1,361 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4labs</artifactId> + <version>2.0.4</version> + </parent> + + <groupId>fr.ifremer</groupId> + <artifactId>suiviobsmer</artifactId> + <version>0.4.1</version> + + <modules> + <module>suiviobsmer-ui</module> + <module>suiviobsmer-business</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonutils.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>${topia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>${tapestry.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + <version>${tapestry.version}</version> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + <version>1.2.0</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.10</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.12</version> + </dependency> + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + <version>2.0</version> + </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.125</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-603.jdbc4</version> + </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-16</version> + </dependency> + +  +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + +  +  +  + + <name>SuiviObsmer</name> + <description>Application pour le suivi d'embarquements sur des bateaux de pêches dans le cadre + d'observations scientifiques.</description> + <inceptionYear>2009</inceptionYear> + + <organization> + <name>Ifremer</name> + <url>http://www.ifremer.fr/</url> + </organization> + +  + <developers> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Chef de Projet</role> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + + <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url> + + <issueManagement> + <system>gforge</system> + <url>https://${platform}/tracker?group_id=${labs.id}</url> + </issueManagement> + +  +  +  + + <packaging>pom</packaging> + + <properties> + + <projectId>suiviobsmer</projectId> + <labs.id>154</labs.id> + +  + <nuitonutils.version>1.1.3</nuitonutils.version> + <topia.version>2.3.0-beta-7</topia.version> + <eugene.version>2.0.0-beta-4</eugene.version> + <tapestry.version>5.1.0.5</tapestry.version> + + </properties> + +  +  +  + + <scm> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.1?root…</url> + </scm> + + <build> + + <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> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> + + </build> + +  +  +  + +  + <mailingLists> + + <mailingList> + <name>${projectId}-devel</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${projectId}-devel</unsubscribe> + <post>${projectId}-devel(a)${labs.list.host}</post> + <archive>http://${labs.list.host}/pipermail/${projectId}-devel/</archive> + </mailingList> + + </mailingLists> + + <repositories> + +  + + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + +  + + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + </repositories> + + <pluginRepositories> + +  + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + +  + + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + +</project> Deleted: tags/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 13:54:13 UTC (rev 327) +++ tags/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 14:04:29 UTC (rev 330) @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>suiviobsmer</artifactId> - <version>0.4.1</version> - </parent> - - <groupId>fr.ifremer.suiviobsmer</groupId> - <artifactId>suiviobsmer-business</artifactId> - - - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - </dependency> -  - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - -  -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> - -  -  -  - - <name>SuiviObsmer :: Business</name> - <description>Métier de l'application SuiviObsmer</description> - -  -  -  - - <packaging>jar</packaging> - -  -  -  - - <build> -  -  - <resources> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>SuiviObsmer.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - - </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>generate-entities</id> - <phase>generate-sources</phase> -  - <configuration> -  -  - <fullPackagePath>fr.ifremer.suiviobsmer</fullPackagePath> -  - <defaultPackage>fr.ifremer.suiviobsmer</defaultPackage> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.topia.generator.InterfaceTransformer, - org.nuiton.topia.generator.BeanTransformer - </templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - <execution> - <phase>generate-sources</phase> - <id>copy-version-files</id> - <configuration> - <includes>**/suiviobsmer.objectmodel</includes> - <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME% - </copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <overwrite>true</overwrite> - </configuration> - <goals> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.0/suiv…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</developerConnection> - </scm> - -</project> Copied: tags/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml (from rev 329, branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml) =================================================================== --- tags/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml (rev 0) +++ tags/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 14:04:29 UTC (rev 330) @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>suiviobsmer</artifactId> + <version>0.4.1</version> + </parent> + + <groupId>fr.ifremer.suiviobsmer</groupId> + <artifactId>suiviobsmer-business</artifactId> + + + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>net.sourceforge.javacsv</groupId> + <artifactId>javacsv</artifactId> + </dependency> +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + +  +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> + +  +  +  + + <name>SuiviObsmer :: Business</name> + <description>Métier de l'application SuiviObsmer</description> + +  +  +  + + <packaging>jar</packaging> + +  +  +  + + <build> +  +  + <resources> + <resource> + <directory>src/main/filters</directory> + <filtering>true</filtering> + <includes> + <include>SuiviObsmer.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + + </resources> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>generate-entities</id> + <phase>generate-sources</phase> +  + <configuration> +  +  + <fullPackagePath>fr.ifremer.suiviobsmer</fullPackagePath> +  + <defaultPackage>fr.ifremer.suiviobsmer</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.InterfaceTransformer, + org.nuiton.topia.generator.BeanTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + <execution> + <phase>generate-sources</phase> + <id>copy-version-files</id> + <configuration> + <includes>**/suiviobsmer.objectmodel</includes> + <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME% + </copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <overwrite>true</overwrite> + </configuration> + <goals> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <scm> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.1/suiv…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</developerConnection> + </scm> + +</project> Deleted: tags/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 13:54:13 UTC (rev 327) +++ tags/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 14:04:29 UTC (rev 330) @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>fr.ifremer</groupId> - <artifactId>suiviobsmer</artifactId> - <version>0.4.1</version> - </parent> - - <groupId>fr.ifremer.suiviobsmer</groupId> - <artifactId>suiviobsmer-ui</artifactId> - - - <dependencies> - <dependency> - <groupId>fr.ifremer.suiviobsmer</groupId> - <artifactId>suiviobsmer-business</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - </dependency> - <dependency> - <groupId>com.orientimport</groupId> - <artifactId>t5-easy-fckeditor</artifactId> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - -  -  -  - - <name>SuiviObsmer :: Web Interface</name> - <description>Interface utilisateur du SuiviObsmer</description> - -  -  -  - - <packaging>war</packaging> - -  -  -  - <build> -  - <finalName>wao-${project.version}</finalName> - -  - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Winstone*</include> - </includes> - </overlay> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - </plugins> - </build> - - <repositories> - - <repository> - <id>m2-release-repository.orientimport.kenai.com</id> - <name>Orient Import Oy Maven Release Repository</name> - <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> - <layout>default</layout> - </repository> - - </repositories> - - <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.0/suiv…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</developerConnection> - </scm> - -</project> Copied: tags/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml (from rev 329, branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml) =================================================================== --- tags/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml (rev 0) +++ tags/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 14:04:29 UTC (rev 330) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>suiviobsmer</artifactId> + <version>0.4.1</version> + </parent> + + <groupId>fr.ifremer.suiviobsmer</groupId> + <artifactId>suiviobsmer-ui</artifactId> + + + <dependencies> + <dependency> + <groupId>fr.ifremer.suiviobsmer</groupId> + <artifactId>suiviobsmer-business</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + </dependency> + <dependency> + <groupId>com.orientimport</groupId> + <artifactId>t5-easy-fckeditor</artifactId> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + +  +  +  + + <name>SuiviObsmer :: Web Interface</name> + <description>Interface utilisateur du SuiviObsmer</description> + +  +  +  + + <packaging>war</packaging> + +  +  +  + <build> +  + <finalName>wao-${project.version}</finalName> + +  + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + </plugins> + </build> + + <repositories> + + <repository> + <id>m2-release-repository.orientimport.kenai.com</id> + <name>Orient Import Oy Maven Release Repository</name> + <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> + <layout>default</layout> + </repository> + + </repositories> + + <scm> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.1/suiv…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</developerConnection> + </scm> + +</project>

1 0

[Suiviobsmer-commits] r329 - in branches/suiviobsmer-0.4.1: . suiviobsmer-business suiviobsmer-ui
by fdesbois＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: fdesbois Date: 2010-02-05 14:02:28 +0000 (Fri, 05 Feb 2010) New Revision: 329 Modified: branches/suiviobsmer-0.4.1/pom.xml branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml Log: prepare 0.4.1 before create tag and deploy Modified: branches/suiviobsmer-0.4.1/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/pom.xml 2010-02-05 13:56:47 UTC (rev 328) +++ branches/suiviobsmer-0.4.1/pom.xml 2010-02-05 14:02:28 UTC (rev 329) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> <modules> <module>suiviobsmer-ui</module> @@ -228,9 +228,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.0?root…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.1?root…</url> </scm> <build> Modified: branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 13:56:47 UTC (rev 328) +++ branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 14:02:28 UTC (rev 329) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId> @@ -163,9 +163,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.0/suiv…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.1/suiv…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</developerConnection> </scm> </project> Modified: branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 13:56:47 UTC (rev 328) +++ branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 14:02:28 UTC (rev 329) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId> @@ -133,9 +133,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.0/suiv…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.0/suivio…</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/suiviobsmer-0.4.1/suiv…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/suiviobsmer-0.4.1/suivio…</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r328 - in branches/suiviobsmer-0.4.1: . suiviobsmer-business suiviobsmer-ui
by fdesbois＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: fdesbois Date: 2010-02-05 13:56:47 +0000 (Fri, 05 Feb 2010) New Revision: 328 Modified: branches/suiviobsmer-0.4.1/pom.xml branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml Log: Use SNAPSHOT to create release Modified: branches/suiviobsmer-0.4.1/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/pom.xml 2010-02-05 13:54:13 UTC (rev 327) +++ branches/suiviobsmer-0.4.1/pom.xml 2010-02-05 13:56:47 UTC (rev 328) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.1</version> + <version>0.4.1-SNAPSHOT</version> <modules> <module>suiviobsmer-ui</module> Modified: branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 13:54:13 UTC (rev 327) +++ branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 13:56:47 UTC (rev 328) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.1</version> + <version>0.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId> Modified: branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml =================================================================== --- branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 13:54:13 UTC (rev 327) +++ branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 13:56:47 UTC (rev 328) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.1</version> + <version>0.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId>

1 0

[Suiviobsmer-commits] r327 - in branches: . suiviobsmer-0.4.1 suiviobsmer-0.4.1/suiviobsmer-business suiviobsmer-0.4.1/suiviobsmer-ui suiviobsmer-0.4.1/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-0.4.1/suiviobsmer-ui/src/main/webapp
by fdesbois＠users.labs.libre-entreprise.org 05 Feb '10

05 Feb '10

Author: fdesbois Date: 2010-02-05 13:54:13 +0000 (Fri, 05 Feb 2010) New Revision: 327 Added: branches/suiviobsmer-0.4.1/ Modified: branches/suiviobsmer-0.4.1/changelog.txt branches/suiviobsmer-0.4.1/pom.xml branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml branches/suiviobsmer-0.4.1/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java branches/suiviobsmer-0.4.1/suiviobsmer-ui/src/main/webapp/Contacts.tml Log: Create branche for 0.4.1 patch for comment save error on contacts table Property changes on: branches/suiviobsmer-0.4.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml target nbactions.xml Added: svn:mergeinfo + Modified: branches/suiviobsmer-0.4.1/changelog.txt =================================================================== --- tags/suiviobsmer-0.4.0/changelog.txt 2010-02-04 22:50:35 UTC (rev 326) +++ branches/suiviobsmer-0.4.1/changelog.txt 2010-02-05 13:54:13 UTC (rev 327) @@ -1,6 +1,17 @@ Release note ============ +0.4.1 +----- + +Evolutions +++++++++++ + +Anomalies ++++++++++ + +- [fdesbois] Ano #2073 : Contacts : Erreur tableau contact sur commentaire refus + 0.4.0 ----- Modified: branches/suiviobsmer-0.4.1/pom.xml =================================================================== --- tags/suiviobsmer-0.4.0/pom.xml 2010-02-04 22:50:35 UTC (rev 326) +++ branches/suiviobsmer-0.4.1/pom.xml 2010-02-05 13:54:13 UTC (rev 327) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.0</version> + <version>0.4.1</version> <modules> <module>suiviobsmer-ui</module> Modified: branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml =================================================================== --- tags/suiviobsmer-0.4.0/suiviobsmer-business/pom.xml 2010-02-04 22:50:35 UTC (rev 326) +++ branches/suiviobsmer-0.4.1/suiviobsmer-business/pom.xml 2010-02-05 13:54:13 UTC (rev 327) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.0</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId> Modified: branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml =================================================================== --- tags/suiviobsmer-0.4.0/suiviobsmer-ui/pom.xml 2010-02-04 22:50:35 UTC (rev 326) +++ branches/suiviobsmer-0.4.1/suiviobsmer-ui/pom.xml 2010-02-05 13:54:13 UTC (rev 327) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>suiviobsmer</artifactId> - <version>0.4.0</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.suiviobsmer</groupId> Modified: branches/suiviobsmer-0.4.1/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- tags/suiviobsmer-0.4.0/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-02-04 22:50:35 UTC (rev 326) +++ branches/suiviobsmer-0.4.1/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-02-05 13:54:13 UTC (rev 327) @@ -584,7 +584,8 @@ // Non abouti, Refus ou Refus Définitif if (contactState.isUnfinishedState()) { - if (oldComment != null && StringUtils.isNotEmpty(contactEdited.getComment()) && !oldComment.equals(contactEdited.getComment())) { + String newComment = contactEdited.getComment(); + if (StringUtils.isNotEmpty(newComment) && !newComment.equals(oldComment)) { // RAZ des champs contactEdited.setTideBeginDate(null); contactEdited.setTideEndDate(null); Modified: branches/suiviobsmer-0.4.1/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- tags/suiviobsmer-0.4.0/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-02-04 22:50:35 UTC (rev 326) +++ branches/suiviobsmer-0.4.1/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-02-05 13:54:13 UTC (rev 327) @@ -227,7 +227,7 @@ <textarea t:type="textarea" t:id="comment" class="hidden contact-comment" value="contactEdited.comment" /> <div t:type="ck/Window" t:id="windowComment" show="false" modal="true" - title="literal:Ajouter un commentaire" width="488" height="210"> + title="literal:Ajouter un commentaire" width="500" height="215"> <p> <textarea id="commentPopup" cols="50" rows="7" /> </p> @@ -235,7 +235,7 @@ <p class="aright"> <a onclick="closeCommentWindow(windowComment, 'commentPopup', 'contact-comment', ${contactstate.isUnfinishedState()}, 'commentImg', '${asset:context:}')" class="save"> <img src="${asset:context:}/img/save-22px.png" alt="Save comment" title="Enregistrer le commentaire"/> - </a> + </a>  </p> </div>

1 0

[Suiviobsmer-commits] r326 - in trunk: suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/bean su
by fdesbois＠users.labs.libre-entreprise.org 04 Feb '10

04 Feb '10

Author: fdesbois Date: 2010-02-04 22:50:35 +0000 (Thu, 04 Feb 2010) New Revision: 326 Removed: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/business/ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/bean/states/ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/ Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/AbstractMappedGridDataSource.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java Log: Clean code for sonar rules + delete old packages and unused classes (old state pattern try) Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java 2010-02-04 22:50:35 UTC (rev 326) @@ -98,11 +98,11 @@ /** BoatInfos comment **/ NAVS_COMMENT(11, "Commentaire"); - int contactHeader; + private int contactHeader; - int boatHeader; + private int boatHeader; - String title; + private String title; BOAT(int indexBoat, String title, int indexContact) { contactHeader = indexContact; @@ -176,7 +176,7 @@ /** SampleRow comment **/ PLAN_COMMENT; - int contactHeader; + private int contactHeader; SAMPLING(int index) { this.contactHeader = index; @@ -212,7 +212,7 @@ /** FishingZone district code **/ PECHE_DIVISION(12); - int contactHeader; + private int contactHeader; FISHING_ZONE(int index) { this.contactHeader = index; @@ -266,7 +266,7 @@ /** Contact program validation **/ CONT_PROGRAM_VALID(32); - int contactHeader; + private int contactHeader; CONTACT(int index) { this.contactHeader = index; @@ -332,11 +332,11 @@ } } - public static int CONTACT_NB_HEADERS = 33; + public static final int CONTACT_NB_HEADERS = 33; - public static int BOAT_NB_HEADERS = 12; + public static final int BOAT_NB_HEADERS = 12; - public static String BOAT_INACTIVE_CODE = "I"; + public static final String BOAT_INACTIVE_CODE = "I"; public static String getHeaderForContactCsv(int index) { for (BOAT boatEnum : BOAT.values()) { @@ -385,11 +385,13 @@ public static Boolean parseContactValidation(CsvReader reader, ImportHeader header) throws IOException { String validation = read(reader, header); - if (validation.equals("A")) { - return Boolean.TRUE; - } else { - return validation.equals("R") ? Boolean.FALSE : null; + Boolean result = null; + if ("A".equals(validation)) { + result = Boolean.TRUE; + } else if ("R".equals(validation)) { + result = Boolean.FALSE; } + return result; } public static String formatContactMammals(boolean mammals) { @@ -398,7 +400,7 @@ public static boolean parseContactMammals(CsvReader reader, ImportHeader header) throws IOException { String mammals = read(reader, header); - return mammals.equals("X"); + return "X".equals(mammals); } protected static String CONTACT_TIME_PATTERN = "HHmmssS"; @@ -473,7 +475,7 @@ */ public static String read(CsvReader reader, ImportHeader header) throws IOException { String result = reader.get(header.name()).trim(); - if (header instanceof ACTIVITY_CALENDAR && result.equals("NA")) { + if (header instanceof ACTIVITY_CALENDAR && "NA".equals(result)) { return null; } return result; @@ -523,7 +525,7 @@ * @see ImportHelper#readDate(CsvReader, ImportHeader) */ public static PeriodDates readPeriod(CsvReader reader, ImportHeader headerBegin, ImportHeader headerEnd) - throws IOException, ParseException, IllegalArgumentException { + throws IOException, ParseException { Date end = readDate(reader, headerEnd); Date begin = readDate(reader, headerBegin); if (begin != null && end != null) { Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/MD5.java 2010-02-04 22:50:35 UTC (rev 326) @@ -45,8 +45,8 @@ try { // on récupère un objet qui permettra de crypter la chaine hash = MessageDigest.getInstance("MD5").digest(uniqueKey); - } catch (NoSuchAlgorithmException e) { - throw new Error("no MD5 support in this VM"); + } catch (NoSuchAlgorithmException eee) { + throw new RuntimeException("no MD5 support in this VM", eee); } StringBuffer hashString = new StringBuffer(); Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2010-02-04 22:50:35 UTC (rev 326) @@ -24,7 +24,6 @@ import fr.ifremer.suiviobsmer.entity.ActivityCalendar; -import java.io.File; import java.io.IOException; import java.util.Date; import java.util.Properties; @@ -84,19 +83,19 @@ } public static Date getCurrentDate() { - return runner.currentDate(); + return runner.getCurrentDate(); } public static String getProperty(String key) { - return runner.configuration().getOption(key); + return runner.getConfiguration().getOption(key); } public static TopiaContext getTopiaRootContext() throws SuiviObsmerException { - if (runner.configuration() == null) { + if (runner.getConfiguration() == null) { throw new SuiviObsmerException("Configuration must be set before initializing context"); } try { - Properties props = runner.configuration().getOptions(); + Properties props = runner.getConfiguration().getOptions(); return TopiaContextFactory.getContext(props); } catch (TopiaNotFoundException eee) { serviceException(null, eee.getMessage(), eee); @@ -161,10 +160,8 @@ throw new SuiviObsmerException("Fatal topia error when close context", eeee); } } - if (eee instanceof SQLGrammarException) { - if (log.isErrorEnabled()) { - log.error("SQL executed with error : " + ((SQLGrammarException)eee).getSQL()); - } + if (eee instanceof SQLGrammarException && log.isErrorEnabled()) { + log.error("SQL executed with error : " + ((SQLGrammarException)eee).getSQL()); } throw new SuiviObsmerException(message,eee); } else { @@ -193,7 +190,7 @@ public static String convertId(String topiaId) { if (topiaId != null && !topiaId.isEmpty()) { - int index = topiaId.indexOf("#"); + int index = topiaId.indexOf('#'); String id = topiaId.replace('#', 'K'); return id.substring(index); } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java 2010-02-04 22:50:35 UTC (rev 326) @@ -22,7 +22,6 @@ package fr.ifremer.suiviobsmer; import java.util.Date; -import java.util.Properties; import org.nuiton.util.ApplicationConfig; /** @@ -43,27 +42,27 @@ * * @throws SuiviObsmerException */ - public void start() throws SuiviObsmerException; + void start() throws SuiviObsmerException; /** * Stop the application. * * @throws SuiviObsmerException */ - public void stop() throws SuiviObsmerException; + void stop() throws SuiviObsmerException; /** * Return the current date, depends on environment. * * @return the current Date */ - public Date currentDate(); + Date getCurrentDate(); /** * Return the configuration depends on environment. * * @return the ApplicationConfig which contains the application properties */ - public ApplicationConfig configuration(); + ApplicationConfig getConfiguration(); } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -28,8 +28,6 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.migration.ManualMigrationEngine; import org.nuiton.util.ApplicationConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * StartSuiviObsmer @@ -44,7 +42,7 @@ */ public class SuiviObsmerRunnerImpl implements SuiviObsmerRunner { - private ApplicationConfig _configuration; + private ApplicationConfig configuration; public SuiviObsmerRunnerImpl() { } @@ -52,20 +50,20 @@ @Override public void start() throws SuiviObsmerException { try { - _configuration = new ApplicationConfig(); - _configuration.setConfigFileName("SuiviObsmer.properties"); - _configuration.parse(new String[]{}); - _configuration.setOption("topia.persistence.classes", + configuration = new ApplicationConfig(); + configuration.setConfigFileName("SuiviObsmer.properties"); + configuration.parse(new String[]{}); + configuration.setOption("topia.persistence.classes", SuiviObsmerModelDAOHelper.getImplementationClassesAsString()); // migration configuration - _configuration.setOption(ManualMigrationEngine.MIGRATION_APPLICATION_VERSION, SuiviObsmerModelDAOHelper.getModelVersion()); - _configuration.setOption(ManualMigrationEngine.MIGRATION_MAPPING_DIRECTORY, "oldmappings"); - _configuration.setOption(ManualMigrationEngine.MIGRATION_MODEL_NAME, "SuiviObsmerModel"); - _configuration.setOption("topia.service.migration", ManualMigrationEngine.class.getName()); - _configuration.setOption(ManualMigrationEngine.MIGRATION_CALLBACK, SuiviObsmerMigrationCallBack.class.getName()); + configuration.setOption(ManualMigrationEngine.MIGRATION_APPLICATION_VERSION, SuiviObsmerModelDAOHelper.getModelVersion()); + configuration.setOption(ManualMigrationEngine.MIGRATION_MAPPING_DIRECTORY, "oldmappings"); + configuration.setOption(ManualMigrationEngine.MIGRATION_MODEL_NAME, "SuiviObsmerModel"); + configuration.setOption("topia.service.migration", ManualMigrationEngine.class.getName()); + configuration.setOption(ManualMigrationEngine.MIGRATION_CALLBACK, SuiviObsmerMigrationCallBack.class.getName()); - _configuration.printConfig(); + configuration.printConfig(); I18n.init(Locale.FRANCE); // Use the context to set the runner for default environment. @@ -88,12 +86,12 @@ } @Override - public Date currentDate() { + public Date getCurrentDate() { return new Date(); } @Override - public ApplicationConfig configuration() { - return _configuration; + public ApplicationConfig getConfiguration() { + return configuration; } } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -22,8 +22,6 @@ package fr.ifremer.suiviobsmer.bean; import fr.ifremer.suiviobsmer.entity.Contact; -import fr.ifremer.suiviobsmer.entity.SampleRow; -import fr.ifremer.suiviobsmer.entity.WaoUser; import java.util.ArrayList; import java.util.List; import org.nuiton.topia.framework.TopiaQuery; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -44,20 +44,6 @@ private static final long serialVersionUID = 1L; - @Override - public void setTideBeginDate(Date beginDate) { - super.setTideBeginDate(beginDate); - // Temporarly commented, tideNbDays is not used yet -// calculTideNbDays(); - } - - @Override - public void setTideEndDate(Date beginDate) { - super.setTideEndDate(beginDate); - // Temporarly commented, tideNbDays is not used yet -// calculTideNbDays(); - } - /** * Calculate the number of days between the tideBeginDate and the tideEndDate. * Automatically called when tideBeginDate or tideEndDate are modified. Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java 2010-02-04 22:50:35 UTC (rev 326) @@ -78,26 +78,26 @@ public class ActivityCalendarKey { - private Boat _boat; - private String _boatId; - private int _year; + private Boat boat; + private String boatId; + private int year; public ActivityCalendarKey(Boat boat, int year) { - _boatId = boat.getTopiaId(); - _year = year; - _boat = boat; + boatId = boat.getTopiaId(); + this.year = year; + this.boat = boat; } public String boatId() { - return _boatId; + return boatId; } public Boat boat() { - return _boat; + return boat; } public int year() { - return _year; + return year; } @Override @@ -106,14 +106,14 @@ throw new ClassCastException("Unable to cast object " + key.getClass() + " to " + this.getClass().getName()); } ActivityCalendarKey calendarKey = (ActivityCalendarKey)key; - return _year == calendarKey.year() && _boatId.equals(calendarKey.boatId()); + return year == calendarKey.year() && boatId.equals(calendarKey.boatId()); } @Override public int hashCode() { int hash = 7; - hash = 61 * hash + (this._boatId != null ? this._boatId.hashCode() : 0); - hash = 61 * hash + this._year; + hash = 61 * hash + (this.boatId != null ? this.boatId.hashCode() : 0); + hash = 61 * hash + this.year; return hash; } } @@ -199,11 +199,6 @@ ActivityCalendar.FIABILITY, fiability); calendar.setActivityMonth(new ArrayList<ActivityMonth>()); - -// if (log.isDebugEnabled()) { -// info("Création d'un calendrier " + year + -// " pour le navire immatriculé " + boatImmatriculation, currRow); -// } } availableCalendars.put(key, calendar); } @@ -272,12 +267,6 @@ profession.setCode(professionCode); profession.setLibelle(professionLibelle); -// String zoneCode = reader.get("SECT_COD").trim(); -// int gradiantCode = Integer.parseInt(reader.get("GRA_COD").trim()); -// String gradiantLibelle = reader.get("GRA_LIB").trim(); -// int zoneId = Integer.parseInt(reader.get("TSECT_COD").trim()); -// String zoneLibelle = reader.get("SECT_LIB").trim(); - String zoneCode = ImportHelper.read(reader, ACTIVITY_CALENDAR.SECT_COD); int gradiantCode = ImportHelper.readInt(reader, ACTIVITY_CALENDAR.GRA_COD); String gradiantLibelle = ImportHelper.read(reader, ACTIVITY_CALENDAR.GRA_LIB); @@ -298,8 +287,6 @@ zone.setZoneLibelle(zoneLibelle); zone.setGradiantCode(gradiantCode); zone.setGradiantLibelle(gradiantLibelle); - } else { - //info("Ligne inactif", currRow); } result++; } else { @@ -351,18 +338,18 @@ } protected void warn(String message, int numRow) throws IOException { - log("[WARN] " + message, numRow); + writeLog("[WARN] " + message, numRow); } protected void error(String message, int numRow) throws IOException { - log("[ERROR] " + message, numRow); + writeLog("[ERROR] " + message, numRow); } protected void info(String message, int numRow) throws IOException { - log("[INFO] " + message, numRow); + writeLog("[INFO] " + message, numRow); } - protected void log(String message, int numRow) throws IOException { + protected void writeLog(String message, int numRow) throws IOException { if (DISABLED) { return; } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -36,7 +36,6 @@ import fr.ifremer.suiviobsmer.bean.CompanyBoatInfos; import fr.ifremer.suiviobsmer.bean.CompanyBoatInfosImpl; import fr.ifremer.suiviobsmer.entity.*; -import fr.ifremer.suiviobsmer.entity.Boat; import fr.ifremer.suiviobsmer.services.ServiceBoat; import java.io.File; import java.io.FileInputStream; @@ -53,8 +52,6 @@ import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DurationFormatUtils; -import org.apache.log4j.PatternLayout; -import org.apache.log4j.RollingFileAppender; import org.nuiton.topia.TopiaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -501,9 +498,7 @@ // Reset limit : no pagination needed for results List<Boat> boats = query.resetLimit().executeToEntityList(); - int curr = 0; for (Boat boat : boats) { - curr++; String[] record = new String[ImportHelper.BOAT_NB_HEADERS]; if (log.isDebugEnabled()) { Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -34,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; import org.nuiton.topia.framework.TopiaQuery; -import fr.ifremer.suiviobsmer.bean.states.ContactStateEnum; import fr.ifremer.suiviobsmer.bean.ContactFilter; import fr.ifremer.suiviobsmer.bean.ImportResults; import fr.ifremer.suiviobsmer.bean.ImportResultsImpl; @@ -62,7 +61,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; -import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -151,7 +149,7 @@ result.setObserver(user); result.setSampleRow(row); result.setBoat(boat); - result.setState(ContactStateEnum.CONTACT_START.getStringValue()); + result.setState(ContactState.CONTACT_START.toString()); return result; } @@ -190,21 +188,7 @@ CsvWriter writer = null; try { transaction = rootContext.beginTransaction(); - - // No contacts from arguments, select all existing from database -// if (contacts == null) { -// ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction); -// if (user.getAdmin()) { -// contacts = dao.findAll(); -// } else { -// // Filtered by company for a simple user -// contacts = dao.createQuery().add(Contact.OBSERVER + "." + WaoUser.COMPANY, user.getCompany()). -// executeToEntityList(); -// } -// } - - //String alea = SuiviObsmerContext.createRandomString(16); - //String filename = "/tmp/wao-contacts-" + alea + ".csv"; + File file = File.createTempFile("wao-contacts-", ".csv"); file.deleteOnExit(); @@ -238,9 +222,7 @@ List<Contact> contacts = query.executeToEntityList(); - int curr = 0; for (Contact contact : contacts) { - curr++; String[] record = new String[ImportHelper.CONTACT_NB_HEADERS]; // Contact part @@ -343,8 +325,6 @@ CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); BoatDAO boatDAO = SuiviObsmerModelDAOHelper.getBoatDAO(transaction); - - DateFormat dateFormat = ImportHelper.getContactDateFormat(); long tic; tic = System.currentTimeMillis(); Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -27,7 +27,6 @@ import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper; import fr.ifremer.suiviobsmer.SuiviObsmerContext; import fr.ifremer.suiviobsmer.bean.SamplingFilter; -import fr.ifremer.suiviobsmer.entity.Company; import fr.ifremer.suiviobsmer.entity.FishingZone; import fr.ifremer.suiviobsmer.entity.FishingZoneDAO; import fr.ifremer.suiviobsmer.entity.Profession; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -36,7 +36,6 @@ import fr.ifremer.suiviobsmer.bean.ImportResultsImpl; import fr.ifremer.suiviobsmer.bean.SamplingFilter; import fr.ifremer.suiviobsmer.entity.*; -import fr.ifremer.suiviobsmer.entity.SampleRow; import fr.ifremer.suiviobsmer.services.ServiceSampling; import java.io.IOException; import java.io.InputStream; @@ -518,7 +517,9 @@ //int nbRefused = 0; while(reader.readRecord()) { + currRow++; + if (log.isTraceEnabled()) { log.trace(" " + Arrays.asList(reader.getValues())); } @@ -534,23 +535,10 @@ row = dao.findByCode(code); // Refuse existing SampleRow if (row != null) { -// if (log.isInfoEnabled()) { -// log.info("Ligne " + currRow + " refusé [CODE = " + code + "] Code déjà existant : " + -// Arrays.asList(reader.getValues())); -// } result.addError(currRow, "[CODE = " + code + "] refusé : Code déjà existant"); - result.incNbRefused(); //nbRefused++; - -// } else if (StringUtils.isEmpty(programName)) { -// throw new SuiviObsmerBusinessException(Type.IMPORT_ERROR, this.getClass(), -// "Erreur à la ligne " + currRow + " [CODE = " + code + "] : " + -// "Cette ligne n'est lié à aucun programme !"); + result.incNbRefused(); // Refuse Fishing zones empty } else if (StringUtils.isEmpty(districts)) { -// if (log.isInfoEnabled()) { -// log.info("Ligne " + currRow + " refusé [CODE = " + code + "] Zone de pêche non renseigné : " + -// Arrays.asList(reader.getValues())); -// } result.addError(currRow, "[CODE = " + code + "] refusé : Zone de pêche non renseigné"); result.incNbRefused(); //nbRefused++; } else { @@ -566,9 +554,6 @@ throw new SuiviObsmerBusinessException(Type.IMPORT_ERROR, this.getClass(), "Erreur à la ligne " + currRow + " [CODE = " + code + "] : " + "La société portant le nom '" + companyName + "' n'existe pas dans l'application"); -// result.addError(currRow, "[CODE = " + code + "] refusé : La société '" + companyName + "' n'existe pas dans l'application"); -// result.incNbRefused(); -// continue; } row.setCompany(company); } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-04 22:50:35 UTC (rev 326) @@ -159,15 +159,15 @@ transaction = rootContext.beginTransaction(); // Initialiaze max boardings and its max key value - final int MAX_BOARDINGS = 12; - final String MAX_BOARDINGS_KEY = MAX_BOARDINGS + " +"; + final int maxBoardings = 12; + final String maxBoardingsKey = maxBoardings + " +"; // Prepare map which contains for each entry the number of boardings // for the key and the number of boats for the value. - for (int i = 1; i < MAX_BOARDINGS; i++) { + for (int i = 1; i < maxBoardings; i++) { map.put(String.valueOf(i), 0); } - map.put(MAX_BOARDINGS_KEY, 0); + map.put(maxBoardingsKey, 0); ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction); @@ -210,8 +210,8 @@ Long count = (Long)row.get(countAlias); int intValue = count.intValue(); String value = count.toString(); - if (intValue >= MAX_BOARDINGS) { - value = MAX_BOARDINGS_KEY; + if (intValue >= maxBoardings) { + value = maxBoardingsKey; } // Increment the number of boats for the current number of // boardings Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" node="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" proxy="fr.ifremer.suiviobsmer.entity.ActivityCalendar" table="activityCalendar"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="year" name="year" node="year" type="int"/> + <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" node="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" proxy="fr.ifremer.suiviobsmer.entity.ActivityMonth" table="activityMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> + <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> + <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> + <property access="field" column="month" name="month" node="month" type="int"/> + <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> + <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" node="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" proxy="fr.ifremer.suiviobsmer.entity.ActivityProfession" table="activityProfession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" name="code" node="code" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="id" name="id" node="id" type="int"/> + <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" node="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" proxy="fr.ifremer.suiviobsmer.entity.ActivityZone" table="activityZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> + <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> + <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> + <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> + <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.BoatImpl" table="boat" node="fr.ifremer.suiviobsmer.entity.BoatImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.BoatImpl" node="fr.ifremer.suiviobsmer.entity.BoatImpl" proxy="fr.ifremer.suiviobsmer.entity.Boat" table="boat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> + <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> + <key column="boat"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> + <key column="boat"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="boat"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" node="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" proxy="fr.ifremer.suiviobsmer.entity.BoatInfos" table="boatInfos"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> + <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> + <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> + <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> + <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.CompanyImpl" table="company" node="fr.ifremer.suiviobsmer.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.CompanyImpl" node="fr.ifremer.suiviobsmer.entity.CompanyImpl" proxy="fr.ifremer.suiviobsmer.entity.Company" table="company"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="address1" name="address1" node="address1" type="text"/> + <property access="field" column="address2" name="address2" node="address2" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <property access="field" column="city" name="city" node="city" type="text"/> + <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> + <key column="company"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> + <key column="company"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ContactImpl" table="contact" node="fr.ifremer.suiviobsmer.entity.ContactImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="text" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ContactImpl" node="fr.ifremer.suiviobsmer.entity.ContactImpl" proxy="fr.ifremer.suiviobsmer.entity.Contact" table="contact"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> + <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> + <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> + <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> + <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> + <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="state" name="state" node="state" type="text"/> + <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" node="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" proxy="fr.ifremer.suiviobsmer.entity.ElligibleBoat" table="elligibleBoat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> + <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" node="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" proxy="fr.ifremer.suiviobsmer.entity.FishingZone" table="fishingZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> + <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.NewsImpl" table="news" node="fr.ifremer.suiviobsmer.entity.NewsImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.NewsImpl" node="fr.ifremer.suiviobsmer.entity.NewsImpl" proxy="fr.ifremer.suiviobsmer.entity.News" table="news"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="content" name="content" node="content" type="text"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ProfessionImpl" table="profession" node="fr.ifremer.suiviobsmer.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ProfessionImpl" node="fr.ifremer.suiviobsmer.entity.ProfessionImpl" proxy="fr.ifremer.suiviobsmer.entity.Profession" table="profession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> + <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> + <property access="field" column="size" name="size" node="size" type="text"/> + <property access="field" column="other" name="other" node="other" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="species" name="species" node="species" type="text"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" node="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" proxy="fr.ifremer.suiviobsmer.entity.SampleMonth" table="sampleMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> + <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> + <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.suiviobsmer.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.suiviobsmer.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.SampleRowImpl" node="fr.ifremer.suiviobsmer.entity.SampleRowImpl" proxy="fr.ifremer.suiviobsmer.entity.SampleRow" table="sampleRow"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> + <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="programName" name="programName" node="programName" type="text"/> + <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> + <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="admin" class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" node="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" proxy="fr.ifremer.suiviobsmer.entity.SampleRowLog" table="sampleRowLog"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="logText" name="logText" node="logText" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" node="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" proxy="fr.ifremer.suiviobsmer.entity.ShipOwner" table="shipOwner"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-02-04 22:50:35 UTC (rev 326) @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity"> - <class name="fr.ifremer.suiviobsmer.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.suiviobsmer.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="admin" type="boolean" access="field" column="admin" node="admin"/> - <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.suiviobsmer.entity"> + <class abstract="false" name="fr.ifremer.suiviobsmer.entity.WaoUserImpl" node="fr.ifremer.suiviobsmer.entity.WaoUserImpl" proxy="fr.ifremer.suiviobsmer.entity.WaoUser" table="waoUser"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="admin" name="admin" node="admin" type="boolean"/> + <many-to-one class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="observer"/> + <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java 2010-02-04 22:50:35 UTC (rev 326) @@ -112,13 +112,13 @@ } @Override - public Date currentDate() { + public Date getCurrentDate() { Calendar calendar = new GregorianCalendar(2009, 9, 23); // 23/10/2009 return calendar.getTime(); } @Override - public ApplicationConfig configuration() { + public ApplicationConfig getConfiguration() { return _configuration; } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java 2010-02-04 22:50:35 UTC (rev 326) @@ -20,14 +20,12 @@ */ package fr.ifremer.suiviobsmer.ui.base; -import fr.ifremer.suiviobsmer.ui.base.*; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.apache.tapestry5.OptionGroupModel; import org.apache.tapestry5.OptionModel; -import org.apache.tapestry5.ValueEncoder; import org.apache.tapestry5.internal.OptionGroupModelImpl; import org.apache.tapestry5.internal.OptionModelImpl; import org.apache.tapestry5.ioc.annotations.Inject; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java 2010-02-04 22:50:35 UTC (rev 326) @@ -34,6 +34,6 @@ */ public interface SuiviObsmerPage { - public boolean isOnlyForAdmin(); + boolean isOnlyForAdmin(); } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-02-04 22:50:35 UTC (rev 326) @@ -24,14 +24,12 @@ import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.dom.Element; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.Response; import org.jfree.chart.ChartUtilities; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java 2010-02-04 22:50:35 UTC (rev 326) @@ -55,10 +55,10 @@ /** Messages d'info */ private List<String> infoMessages; - private boolean hasErrors; + private boolean errors; @Inject - private ComponentResources _resources; + private ComponentResources resources; public FeedBack() { errorMessages = new ArrayList<String>(); @@ -69,7 +69,7 @@ // Rendu des messages d'erreur et vidage de la collection if (!errorMessages.isEmpty()) { - hasErrors = true; + errors = true; writer.element("div", "class", "fb-error"); for (String message : errorMessages) { writer.write(message); @@ -92,7 +92,7 @@ } infoMessages.clear(); - _resources.renderInformalParameters(writer); + resources.renderInformalParameters(writer); } void afterRender(MarkupWriter writer) { @@ -122,6 +122,6 @@ } public boolean hasErrors() { - return hasErrors; + return errors; } } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java 2010-02-04 22:50:35 UTC (rev 326) @@ -95,6 +95,14 @@ } } + /** + * Test if the current user in session is a valid user. + * Test topia id existence because WaoUser can be empty when session is lost + * + * @return true if the current user is a valide user (not empty). + * @see fr.ifremer.suiviobsmer.ui.services.AppModule# + * contributeApplicationStateManager(MappedConfiguration) + */ @Log public boolean isCurrentUserExists() { return StringUtils.isNotEmpty(currentUser.getTopiaId()); Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java 2010-02-04 22:50:35 UTC (rev 326) @@ -59,65 +59,59 @@ * the form submission (this is usually desirable). */ @Parameter - private boolean _defer = true; + private boolean defer = true; @Parameter - private String _context; + private String context; @Environmental - private FormSupport _formSupport; + private FormSupport formSupport; @Environmental - private Heartbeat _heartbeat; + private Heartbeat heartbeat; @Inject - private ComponentResources _resources; + private ComponentResources resources; @Inject - private Request _request; + private Request request; - public SubmitContext() - { + public SubmitContext() { } - SubmitContext(Request request) - { - _request = request; + SubmitContext(Request request) { + this.request = request; } - void beginRender(MarkupWriter writer) - { + void beginRender(MarkupWriter writer) { // write a hidden input for the context //String elementName = getElementName(); String elementName = getControlName(); //Modified to work with 5.0.12 - writer.element("input", "type", "hidden", "name", elementName + "X", "value", _context); + writer.element("input", "type", "hidden", "name", elementName + "X", "value", context); writer.end(); // now the submit writer.element("input", "type", "submit", "name", elementName, "id", getClientId()); - _resources.renderInformalParameters(writer); + resources.renderInformalParameters(writer); } - void afterRender(MarkupWriter writer) - { + void afterRender(MarkupWriter writer) { writer.end(); } - //protected void processSubmission(FormSupport formSupport, String elementName) @Override - protected void processSubmission(String elementName) //Modified to work with 5.0.12 - { - String value = _request.getParameter(elementName); - final String context = _request.getParameter(elementName + "X"); + protected void processSubmission(String elementName) { + String value = request.getParameter(elementName); + final String cxt = request.getParameter(elementName + "X"); - if (value == null) + if (value == null) { return; + } - Runnable sendNotification = new Runnable() - { - public void run() - { - _resources.triggerEvent(SELECTED_EVENT, new Object[] {context}, null); + Runnable sendNotification = new Runnable() { + @Override + public void run() { + resources.triggerEvent(SELECTED_EVENT, new Object[] {cxt}, null); } }; @@ -126,24 +120,22 @@ // information will change if we defer. Another option might be to wait until the next // heartbeak? - if (_defer) - _formSupport.defer(sendNotification); - else - _heartbeat.defer(sendNotification); - + if (defer) { + formSupport.defer(sendNotification); + } else { + heartbeat.defer(sendNotification); + } } // For testing: - void setDefer(boolean defer) - { - _defer = defer; + void setDefer(boolean defer) { + this.defer = defer; } - void setup(ComponentResources resources, FormSupport support, Heartbeat heartbeat) - { - _resources = resources; - _formSupport = support; - _heartbeat = heartbeat; + void setup(ComponentResources resources, FormSupport support, Heartbeat heartbeat) { + this.resources = resources; + formSupport = support; + this.heartbeat = heartbeat; } } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/AbstractMappedGridDataSource.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/AbstractMappedGridDataSource.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/AbstractMappedGridDataSource.java 2010-02-04 22:50:35 UTC (rev 326) @@ -32,13 +32,9 @@ */ public abstract class AbstractMappedGridDataSource<K, E extends TopiaEntity> implements GridDataSource { -// @Inject -// private ServiceContact serviceContact; private Logger log = LoggerFactory.getLogger(AbstractMappedGridDataSource.class); -// private UserFilter filter; - private Map<K, E> mapResults; private List<E> listResults; @@ -47,10 +43,6 @@ private int nbRowsPerPage; -// public AbstractMappedGridDataSource(UserFilter filter) { -// this.filter = filter; -// } - @Override public int getAvailableRows() { if (nbRows < 0) { @@ -99,59 +91,59 @@ return null; } - protected void sortResults(List<SortConstraint> sortConstraints) { +// protected void sortResults(List<SortConstraint> sortConstraints) { +// +// for (SortConstraint constraint : sortConstraints) +// { +// final ColumnSort sort = constraint.getColumnSort(); +// +// if (sort == ColumnSort.UNSORTED) continue; +// +// final PropertyConduit conduit = constraint.getPropertyModel().getConduit(); +// +// final Comparator valueComparator = new Comparator<Comparable>() +// { +// public int compare(Comparable o1, Comparable o2) +// { +// // Simplify comparison, and handle case where both are nulls. +// +// if (o1 == o2) return 0; +// +// if (o2 == null) return 1; +// +// if (o1 == null) return -1; +// +// return o1.compareTo(o2); +// } +// }; +// +// final Comparator rowComparator = new Comparator() +// { +// public int compare(Object row1, Object row2) +// { +// Comparable value1 = (Comparable) conduit.get(row1); +// Comparable value2 = (Comparable) conduit.get(row2); +// +// return valueComparator.compare(value1, value2); +// } +// }; +// +// final Comparator reverseComparator = new Comparator() +// { +// public int compare(Object o1, Object o2) +// { +// int modifier = sort == ColumnSort.ASCENDING ? 1 : -1; +// +// return modifier * rowComparator.compare(o1, o2); +// } +// }; +// +// // We can freely sort this list because its just a copy. +// +// Collections.sort(listResults, reverseComparator); +// } +// } - for (SortConstraint constraint : sortConstraints) - { - final ColumnSort sort = constraint.getColumnSort(); - - if (sort == ColumnSort.UNSORTED) continue; - - final PropertyConduit conduit = constraint.getPropertyModel().getConduit(); - - final Comparator valueComparator = new Comparator<Comparable>() - { - public int compare(Comparable o1, Comparable o2) - { - // Simplify comparison, and handle case where both are nulls. - - if (o1 == o2) return 0; - - if (o2 == null) return 1; - - if (o1 == null) return -1; - - return o1.compareTo(o2); - } - }; - - final Comparator rowComparator = new Comparator() - { - public int compare(Object row1, Object row2) - { - Comparable value1 = (Comparable) conduit.get(row1); - Comparable value2 = (Comparable) conduit.get(row2); - - return valueComparator.compare(value1, value2); - } - }; - - final Comparator reverseComparator = new Comparator() - { - public int compare(Object o1, Object o2) - { - int modifier = sort == ColumnSort.ASCENDING ? 1 : -1; - - return modifier * rowComparator.compare(o1, o2); - } - }; - - // We can freely sort this list because its just a copy. - - Collections.sort(listResults, reverseComparator); - } - } - @Override public Object getRowValue(int index) { index = index % nbRowsPerPage; @@ -165,7 +157,7 @@ } @Override - public abstract Class getRowType(); + public abstract Class<?> getRowType(); public E get(K key) { return mapResults.get(key); Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-02-04 22:50:35 UTC (rev 326) @@ -25,9 +25,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; -import java.util.SortedMap; import org.jfree.chart.JFreeChart; -import org.jfree.chart.axis.AxisSpace; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; @@ -86,7 +84,6 @@ DefaultCategoryDataset dataset = new DefaultCategoryDataset(); // Fill data in dataset - int i = 0; for (Map.Entry<String, Map<?, Integer>> map : input.entrySet()) { for (Map.Entry<?, Integer> data : map.getValue().entrySet()) { Object dataKey = data.getKey(); @@ -99,7 +96,6 @@ } dataset.setValue(data.getValue(), map.getKey(), columnKey); } - i++; } // Axises Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java 2010-02-04 22:50:35 UTC (rev 326) @@ -114,7 +114,7 @@ private boolean addNewUserSelected; private boolean deleteUserSelected; - void setupRender() { + void setupRender() throws SuiviObsmerException { companies = null; getCompanies(); user = null; @@ -153,28 +153,24 @@ /**************************** FORMS ****************************************/ - public List<Company> getCompanies() { + public List<Company> getCompanies() throws SuiviObsmerException { if (companies == null) { - try { - if (log.isInfoEnabled()) { - log.info("BUSINESS REQUEST [getCompanies]"); - } - companies = serviceUser.getCompanies(false); - } catch(SuiviObsmerException eee) { - // errors + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [getCompanies]"); } + companies = serviceUser.getCompanies(false); } return companies; } - public GenericSelectModel<Company> getCompaniesSelectModel() { + public GenericSelectModel<Company> getCompaniesSelectModel() throws SuiviObsmerException { if (companiesSelectModel == null) { companiesSelectModel = new GenericSelectModel<Company>(getCompanies(), Company.class, Company.NAME, "id", propertyAccess); } return companiesSelectModel; } - public Company getCompany() { + public Company getCompany() throws SuiviObsmerException { if (company == null) { if (companyId != null) { company = getCompaniesSelectModel().findObject(companyId); @@ -185,7 +181,7 @@ return company; } - public boolean isUsersAvailable() { + public boolean isUsersAvailable() throws SuiviObsmerException { return !StringUtils.isEmpty(getCompany().getId()) && getCompany().getActive(); } @@ -207,7 +203,7 @@ } @Log - public GenericSelectModel<WaoUser> getUsersSelectModel() { + public GenericSelectModel<WaoUser> getUsersSelectModel() throws SuiviObsmerException { if (usersSelectModel == null) { List<WaoUser> users = getCompany().getWaoUser(); if (log.isDebugEnabled()) { @@ -219,7 +215,7 @@ } @Log - public WaoUser getUser() { + public WaoUser getUser() throws SuiviObsmerException { if (user == null) { if (userId != null) { if (log.isDebugEnabled()) { Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-02-04 22:50:35 UTC (rev 326) @@ -68,7 +68,6 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.BeanModelSource; -import org.apache.tapestry5.services.Response; import org.apache.tapestry5.upload.services.UploadedFile; import org.nuiton.util.DateUtils; import org.slf4j.Logger; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/ExceptionReport.java 2010-02-04 22:50:35 UTC (rev 326) @@ -27,7 +27,6 @@ import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.runtime.ComponentEventException; import org.apache.tapestry5.services.ExceptionReporter; import org.slf4j.Logger; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-02-04 22:50:35 UTC (rev 326) @@ -587,10 +587,7 @@ if (periodBegin != null && periodEnd != null) { - int size = getSampleMonths().size(); - SampleMonth firstMonth = getSampleMonths().get(0); - //SampleMonth lastMonth = getSampleMonths().get(size-1); if (firstMonth != null) { Date firstDate = firstMonth.getPeriodDate(); Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java 2010-02-04 21:33:50 UTC (rev 325) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java 2010-02-04 22:50:35 UTC (rev 326) @@ -23,7 +23,6 @@ import fr.ifremer.suiviobsmer.SuiviObsmerBusinessException; -import fr.ifremer.suiviobsmer.SuiviObsmerContext; import fr.ifremer.suiviobsmer.SuiviObsmerException; import fr.ifremer.suiviobsmer.bean.FacadeRow; import fr.ifremer.suiviobsmer.bean.ImportResults;

1 0