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

r1712 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 05 Mar '14

05 Mar '14

Author: bleny Date: 2014-03-05 12:21:07 +0100 (Wed, 05 Mar 2014) New Revision: 1712 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1712 Log: add delegate methods in ServiceSupport Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-03-05 11:20:21 UTC (rev 1711) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-03-05 11:21:07 UTC (rev 1712) @@ -2,6 +2,34 @@ import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.entity.BoatGroupTopiaDao; +import fr.ifremer.wao.entity.BoatInfosTopiaDao; +import fr.ifremer.wao.entity.BoatTopiaDao; +import fr.ifremer.wao.entity.CompanyTopiaDao; +import fr.ifremer.wao.entity.ContactStateMotifTopiaDao; +import fr.ifremer.wao.entity.ContactTopiaDao; +import fr.ifremer.wao.entity.DCF5CodeTopiaDao; +import fr.ifremer.wao.entity.ElligibleBoatTopiaDao; +import fr.ifremer.wao.entity.FishingGearDCFTopiaDao; +import fr.ifremer.wao.entity.FishingZoneTopiaDao; +import fr.ifremer.wao.entity.FleetTopiaDao; +import fr.ifremer.wao.entity.IndicatorLevelTopiaDao; +import fr.ifremer.wao.entity.IndicatorLogTopiaDao; +import fr.ifremer.wao.entity.IndicatorTopiaDao; +import fr.ifremer.wao.entity.NewsTopiaDao; +import fr.ifremer.wao.entity.ObsDebCodeDetailsTopiaDao; +import fr.ifremer.wao.entity.ObsDebCodeTopiaDao; +import fr.ifremer.wao.entity.ProfessionTopiaDao; +import fr.ifremer.wao.entity.ReferentialMetaTopiaDao; +import fr.ifremer.wao.entity.SampleMonthTopiaDao; +import fr.ifremer.wao.entity.SampleRowLogTopiaDao; +import fr.ifremer.wao.entity.SampleRowTopiaDao; +import fr.ifremer.wao.entity.ShipOwnerTopiaDao; +import fr.ifremer.wao.entity.TargetSpeciesDCFTopiaDao; +import fr.ifremer.wao.entity.TerrestrialDivisionTopiaDao; +import fr.ifremer.wao.entity.TerrestrialLocationTopiaDao; +import fr.ifremer.wao.entity.UserProfileTopiaDao; +import fr.ifremer.wao.entity.WaoUserTopiaDao; import fr.ifremer.wao.services.WaoService; import fr.ifremer.wao.services.WaoServiceContext; import fr.ifremer.wao.services.WaoWebApplicationContext; @@ -29,11 +57,11 @@ return serviceContext.getPersistenceContext(); } - public WaoWebApplicationContext getWebApplicationContext() { + protected WaoWebApplicationContext getWebApplicationContext() { return serviceContext.getWebApplicationContext(); } - public <E extends WaoService> E newService(Class<E> serviceClass) { + protected <E extends WaoService> E newService(Class<E> serviceClass) { return serviceContext.newService(serviceClass); } @@ -48,4 +76,120 @@ protected ReferentialService getReferentialService() { return newService(ReferentialService.class); } + + protected CompaniesService getCompaniesService() { + return newService(CompaniesService.class); + } + + protected BoatTopiaDao getBoatDao() { + return getPersistenceContext().getBoatDao(); + } + + protected BoatGroupTopiaDao getBoatGroupDao() { + return getPersistenceContext().getBoatGroupDao(); + } + + protected BoatInfosTopiaDao getBoatInfosDao() { + return getPersistenceContext().getBoatInfosDao(); + } + + protected CompanyTopiaDao getCompanyDao() { + return getPersistenceContext().getCompanyDao(); + } + + protected ContactTopiaDao getContactDao() { + return getPersistenceContext().getContactDao(); + } + + protected ContactStateMotifTopiaDao getContactStateMotifDao() { + return getPersistenceContext().getContactStateMotifDao(); + } + + protected DCF5CodeTopiaDao getDCF5CodeDao() { + return getPersistenceContext().getDCF5CodeDao(); + } + + protected ElligibleBoatTopiaDao getElligibleBoatDao() { + return getPersistenceContext().getElligibleBoatDao(); + } + + protected FishingGearDCFTopiaDao getFishingGearDCFDao() { + return getPersistenceContext().getFishingGearDCFDao(); + } + + protected FishingZoneTopiaDao getFishingZoneDao() { + return getPersistenceContext().getFishingZoneDao(); + } + + protected FleetTopiaDao getFleetDao() { + return getPersistenceContext().getFleetDao(); + } + + protected IndicatorTopiaDao getIndicatorDao() { + return getPersistenceContext().getIndicatorDao(); + } + + protected IndicatorLevelTopiaDao getIndicatorLevelDao() { + return getPersistenceContext().getIndicatorLevelDao(); + } + + protected IndicatorLogTopiaDao getIndicatorLogDao() { + return getPersistenceContext().getIndicatorLogDao(); + } + + protected NewsTopiaDao getNewsDao() { + return getPersistenceContext().getNewsDao(); + } + + protected ObsDebCodeTopiaDao getObsDebCodeDao() { + return getPersistenceContext().getObsDebCodeDao(); + } + + protected ObsDebCodeDetailsTopiaDao getObsDebCodeDetailsDao() { + return getPersistenceContext().getObsDebCodeDetailsDao(); + } + + protected ProfessionTopiaDao getProfessionDao() { + return getPersistenceContext().getProfessionDao(); + } + + protected ReferentialMetaTopiaDao getReferentialMetaDao() { + return getPersistenceContext().getReferentialMetaDao(); + } + + protected SampleMonthTopiaDao getSampleMonthDao() { + return getPersistenceContext().getSampleMonthDao(); + } + + protected SampleRowTopiaDao getSampleRowDao() { + return getPersistenceContext().getSampleRowDao(); + } + + protected SampleRowLogTopiaDao getSampleRowLogDao() { + return getPersistenceContext().getSampleRowLogDao(); + } + + protected ShipOwnerTopiaDao getShipOwnerDao() { + return getPersistenceContext().getShipOwnerDao(); + } + + protected TargetSpeciesDCFTopiaDao getTargetSpeciesDCFDao() { + return getPersistenceContext().getTargetSpeciesDCFDao(); + } + + protected TerrestrialDivisionTopiaDao getTerrestrialDivisionDao() { + return getPersistenceContext().getTerrestrialDivisionDao(); + } + + protected TerrestrialLocationTopiaDao getTerrestrialLocationDao() { + return getPersistenceContext().getTerrestrialLocationDao(); + } + + protected UserProfileTopiaDao getUserProfileDao() { + return getPersistenceContext().getUserProfileDao(); + } + + protected WaoUserTopiaDao getWaoUserDao() { + return getPersistenceContext().getWaoUserDao(); + } }

1 0

r1711 - trunk/wao-persistence/src/main/java/fr/ifremer/wao
by bleny＠users.forge.codelutin.com 05 Mar '14

05 Mar '14

Author: bleny Date: 2014-03-05 12:20:21 +0100 (Wed, 05 Mar 2014) New Revision: 1711 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1711 Log: fix missing topia configuration directives at runtime Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-03-04 09:56:19 UTC (rev 1710) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-03-05 11:20:21 UTC (rev 1711) @@ -50,6 +50,8 @@ Map<String, String> jpaParameters = Maps.newHashMap(); Properties hibernateProperties = applicationConfig.getOptionStartsWith("hibernate"); jpaParameters.putAll((Map) hibernateProperties); + Properties topiaProperties = applicationConfig.getOptionStartsWith("topia"); + jpaParameters.putAll((Map) topiaProperties); return jpaParameters; }

1 0

r1710 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/action/administration
by bleny＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: bleny Date: 2014-03-04 10:56:19 +0100 (Tue, 04 Mar 2014) New Revision: 1710 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1710 Log: refs #4560 add missing CRUD operations for companies Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java 2014-03-03 17:16:55 UTC (rev 1709) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java 2014-03-04 09:56:19 UTC (rev 1710) @@ -3,8 +3,10 @@ import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.CompanyTopiaDao; +import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; +import java.util.Map; public class CompaniesService extends WaoServiceSupport { @@ -52,4 +54,22 @@ } + public void deleteCompany(String companyId) throws IllegalDeletionException { + + CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); + + Company company = dao.findByTopiaId(companyId); + + Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> allUsages = dao.findAllUsages(company); + + if (allUsages.isEmpty()) { + dao.delete(company); + } else { + throw new IllegalDeletionException(allUsages.keySet()); + } + + commit(); + + } + } Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java 2014-03-04 09:56:19 UTC (rev 1710) @@ -0,0 +1,25 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.WaoException; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.Set; + +/** + * L'utilisateur a voulu supprimer une entité mais on doit refuser sa demande car + * elle est liée à d'autres entités en base. + */ +public class IllegalDeletionException extends WaoException { + + /** Les types d'entités qui utilisent l'entité qu'on ne peut pas supprimer. */ + protected Set<Class<? extends TopiaEntity>> classes; + + public IllegalDeletionException(Set<Class<? extends TopiaEntity>> classes) { + this.classes = classes; + } + + public Set<Class<? extends TopiaEntity>> getClasses() { + return classes; + } + +} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-03 17:16:55 UTC (rev 1709) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-04 09:56:19 UTC (rev 1710) @@ -1,6 +1,7 @@ package fr.ifremer.wao.web; import fr.ifremer.wao.WaoApplicationConfig; +import org.nuiton.i18n.I18n; import org.nuiton.web.struts2.BaseAction; public class WaoActionSupport extends BaseAction { @@ -21,4 +22,8 @@ this.session = session; } + public String t(String key, Object... args) { + return I18n.l(getLocale(), key, args); + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-03 17:16:55 UTC (rev 1709) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-04 09:56:19 UTC (rev 1710) @@ -1,12 +1,13 @@ package fr.ifremer.wao.web.action.administration; +import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.services.service.CompaniesService; import fr.ifremer.wao.web.WaoJspActionSupport; import java.util.List; -public class CompaniesAction extends WaoJspActionSupport { +public class CompaniesAction extends WaoJspActionSupport implements Preparable { protected CompaniesService service; @@ -17,12 +18,10 @@ } @Override - public String execute() { + public void prepare() { companies = service.getCompanies(); - return SUCCESS; - } public List<Company> getCompanies() { Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java 2014-03-04 09:56:19 UTC (rev 1710) @@ -0,0 +1,49 @@ +package fr.ifremer.wao.web.action.administration; + +import fr.ifremer.wao.services.service.CompaniesService; +import fr.ifremer.wao.services.service.IllegalDeletionException; +import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="error", type="redirectAction", params = { "actionName", "companies" }), + @Result(name="success", type="redirectAction", params = { "actionName", "companies" }) +}) +public class DeleteCompanyAction extends WaoJspActionSupport { + + protected CompaniesService service; + + protected String companyId; + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public void setService(CompaniesService service) { + this.service = service; + } + + @Override + public String execute() { + + try { + + service.deleteCompany(companyId); + + session.addMessage(t("wao.ui.action.deleteCompany.success")); + + return SUCCESS; + + } catch (IllegalDeletionException e) { + + // TODO brendan 04/03/14 préciser le problème + session.addErrorMessages(t("wao.ui.action.deleteCompany.failure")); + + return ERROR; + + } + + } + +} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-03 17:16:55 UTC (rev 1709) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-04 09:56:19 UTC (rev 1710) @@ -45,7 +45,7 @@ service.save(company); - addActionMessage("Société enregistrée"); + session.addMessage(t("wao.ui.action.save.success")); return SUCCESS; @@ -58,4 +58,5 @@ public Company getCompany() { return company; } + }

1 0

r1709 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/administration wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/administration wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com 03 Mar '14

03 Mar '14

Author: bleny Date: 2014-03-03 18:16:55 +0100 (Mon, 03 Mar 2014) New Revision: 1709 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1709 Log: refs #4560 add CRUD operations for companies Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompaniesService.java 2014-03-03 17:16:55 UTC (rev 1709) @@ -0,0 +1,55 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.CompanyImpl; +import fr.ifremer.wao.entity.CompanyTopiaDao; + +import java.util.List; + +public class CompaniesService extends WaoServiceSupport { + + public List<Company> getCompanies() { + + CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); + + List<Company> companies = dao.newQueryBuilder().setOrderByArguments(Company.PROPERTY_ACTIVE + " desc", Company.PROPERTY_NAME).findAll(); + + return companies; + + } + + public Company getCompany(String companyId) { + + CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); + + Company company = dao.findByTopiaId(companyId); + + return company; + + } + + public Company newCompany() { + + CompanyImpl newCompany = new CompanyImpl(); + + newCompany.setActive(true); + + return newCompany; + + } + + public void save(Company company) { + + CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); + + if (company.isPersisted()) { + dao.update(company); + } else { + dao.create(company); + } + + commit(); + + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-03 17:16:55 UTC (rev 1709) @@ -0,0 +1,32 @@ +package fr.ifremer.wao.web.action.administration; + +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.services.service.CompaniesService; +import fr.ifremer.wao.web.WaoJspActionSupport; + +import java.util.List; + +public class CompaniesAction extends WaoJspActionSupport { + + protected CompaniesService service; + + protected List<Company> companies; + + public void setService(CompaniesService service) { + this.service = service; + } + + @Override + public String execute() { + + companies = service.getCompanies(); + + return SUCCESS; + + } + + public List<Company> getCompanies() { + return companies; + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-03 17:16:55 UTC (rev 1709) @@ -0,0 +1,61 @@ +package fr.ifremer.wao.web.action.administration; + +import com.opensymphony.xwork2.Preparable; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.services.service.CompaniesService; +import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.commons.lang3.StringUtils; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "companies" }) +}) +public class EditCompanyAction extends WaoJspActionSupport implements Preparable { + + protected CompaniesService service; + + protected String companyId; + + protected Company company; + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public void setCompany(Company company) { + this.company = company; + } + + public void setService(CompaniesService service) { + this.service = service; + } + + @Override + public void prepare() { + if (StringUtils.isEmpty(companyId)) { + company = service.newCompany(); + } else { + company = service.getCompany(companyId); + } + } + + @Override + public String execute() { + + service.save(company); + + addActionMessage("Société enregistrée"); + + return SUCCESS; + + } + + public String getCompanyId() { + return companyId; + } + + public Company getCompany() { + return company; + } +} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-02-28 17:37:02 UTC (rev 1708) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-03-03 17:16:55 UTC (rev 1709) @@ -45,6 +45,7 @@ service.save(news); + // TODO brendan 03/03/14 i18n addActionMessage("Actualité enregistrée"); return SUCCESS; Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-02-28 17:37:02 UTC (rev 1708) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-03 17:16:55 UTC (rev 1709) @@ -59,6 +59,7 @@ wao.ui.action.unvalidateContact=Unvalidate contact wao.ui.action.viewBoatsForRow=View the boats for this sample row wao.ui.action.viewIndicatorsHistory=View indicators historic +wao.ui.actions=Actions wao.ui.boatList=List of %s boats wao.ui.boatinfo.title=Infos about %s wao.ui.boats.associatedLine=Sample row(s) associated with this boat @@ -290,6 +291,7 @@ wao.ui.page.SamplingPlan.title=Sampling plan wao.ui.page.Synthesis.title=Synthesis wao.ui.page.UserProfileForm.title=Profile management +wao.ui.page.companies.title=Companies wao.ui.publishedByProgram=Pusblished by program wao.ui.publishedByYourCompany=Published by company wao.ui.sampleRow.creation=Creation of a sample row Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-02-28 17:37:02 UTC (rev 1708) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-03 17:16:55 UTC (rev 1709) @@ -59,6 +59,7 @@ wao.ui.action.unvalidateContact=Invalider le contact wao.ui.action.viewBoatsForRow=Voir les navires présentis pour cette ligne wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs +wao.ui.actions=Actions wao.ui.boatList=Liste de %s navires wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associée(s) à ce navire @@ -290,6 +291,7 @@ wao.ui.page.SamplingPlan.title=Plan d'échantillonnage wao.ui.page.Synthesis.title=Synthèse wao.ui.page.UserProfileForm.title=Gestion du profil +wao.ui.page.companies.title=Sociétés wao.ui.publishedByProgram=Publiée par le programme wao.ui.publishedByYourCompany=Publiée par la société wao.ui.sampleRow.creation=Création d'une ligne du plan d'échantillonnage Added: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp 2014-03-03 17:16:55 UTC (rev 1709) @@ -0,0 +1,68 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@taglib uri="/struts-tags" prefix="s" %> + +<html> + + <head> + + </head> + + <h1><s:text name="wao.ui.page.companies.title" /></h1> + + <table class="table table-bordered"> + <tr> + <th> + <s:text name="wao.ui.field.Company.name" /> + </th> + <th> + <s:text name="wao.ui.field.Company.active" /> + </th> + <th> + <s:text name="wao.ui.actions" /> + </th> + </tr> + <s:iterator value="companies"> + <tr> + <td> + <s:if test="active"> + <s:property value="name" /> + </s:if> + <s:else> + <del> + <s:property value="name" /> + </del> + </s:else> + </td> + <td> + <s:if test="active"> + <s:text name="wao.ui.misc.yes" /> + </s:if> + <s:else> + <s:text name="wao.ui.misc.no" /> + </s:else> + </td> + <td> + <s:url action="edit-company!input" id="editCompanyUrl"> + <s:param name="companyId" value="topiaId" /> + </s:url> + <s:a href="%{editCompanyUrl}"> + <s:text name="wao.ui.action.edit" /> + </s:a> + + <s:url action="delete-company" id="deleteCompanyUrl"> + <s:param name="companyId" value="topiaId" /> + </s:url> + <s:a href="%{deleteCompanyUrl}"> + <s:text name="wao.ui.action.delete" /> + </s:a> + </td> + </tr> + </s:iterator> + </table> + + <s:url action="edit-company!input" id="createCompanyUrl" /> + <s:a href="%{createCompanyUrl}"> + <s:text name="wao.ui.action.createCompany" /> + </s:a> + +</html> Added: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp 2014-03-03 17:16:55 UTC (rev 1709) @@ -0,0 +1,35 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@taglib uri="/struts-tags" prefix="s" %> + +<html> + <head> + </head> + + <s:form> + + <s:hidden name="companyId" value="%{companyId}" /> + + <s:textfield name="company.name" label="%{getText('wao.ui.field.Company.name')}" requiredLabel="true" cssClass="input-xxlarge" /> + <s:textfield name="company.address1" label="%{getText('wao.ui.field.Company.address1')}" cssClass="input-xxlarge" /> + <s:textfield name="company.address2" label="%{getText('wao.ui.field.Company.address2')}" cssClass="input-xxlarge" /> + <s:textfield name="company.postalCode" label="%{getText('wao.ui.field.Company.postalCode')}" cssClass="input-xxlarge" /> + <s:textfield name="company.city" label="%{getText('wao.ui.field.Company.city')}" cssClass="input-xxlarge" /> + <s:textfield name="company.phoneNumber" label="%{getText('wao.ui.field.Company.phoneNumber')}" size="14" /> + <s:textfield type="email" name="company.email" label="%{getText('wao.ui.field.Company.email')}" cssClass="input-xxlarge" /> + + <s:checkbox name="company.active" label="%{getText('wao.ui.field.Company.active')}" /> + + <div class="form-actions"> + <s:url action="companies" id="companiesUrl" /> + <s:a href="%{companiesUrl}" cssClass="btn"> + <s:text name="wao.ui.action.cancel" /> + </s:a> + + <s:submit type="button" cssClass="btn"> + <s:text name="wao.ui.action.save" /> + </s:submit> + </div> + + </s:form> + +</html> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-02-28 17:37:02 UTC (rev 1708) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-03-03 17:16:55 UTC (rev 1709) @@ -8,7 +8,8 @@ </head> <s:url action="edit-news!input" id="createNewsUrl" /> - <s:a href="%{createNewsUrl}" title="Ajouter une actualité"> + <s:a href="%{createNewsUrl}"> + <%-- TODO i18n --> Ajouter une actualité </s:a> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-02-28 17:37:02 UTC (rev 1708) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-03 17:16:55 UTC (rev 1709) @@ -70,6 +70,12 @@ <s:text name="wao.ui.page.ReferentialManagement.title" /> </s:a> </li> + <li> + <s:url namespace="/administration" action="companies" id="companiesUrl" /> + <s:a href="%{companiesUrl}"> + <s:text name="wao.ui.page.companies.title" /> + </s:a> + </li> </ul> </li> <li class="dropdown">

1 0

r1708 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources/i18n wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations wao-services/src/test/java/fr/ifremer/wao/services/service wao-services/src/test/resources wao-services/src/test/resources/import
by bleny＠users.forge.codelutin.com 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 18:37:02 +0100 (Fri, 28 Feb 2014) New Revision: 1708 Url: http://codelutin.com/projects/wao/repository/revisions/1708 Log: fix issues due to using guava for indexation, introduce ReferentielServiceTest Added: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ReferentialServiceTest.java trunk/wao-services/src/test/resources/import/ Removed: trunk/wao-services/src/test/resources/import/activity.csv trunk/wao-services/src/test/resources/import/activity.csv.gz trunk/wao-services/src/test/resources/import/boat_districts.kml trunk/wao-services/src/test/resources/import/dates.csv trunk/wao-services/src/test/resources/import/misc.csv Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ReferentialService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/CompanyParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateMotivesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObsDebCodeParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/PortParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -21,6 +21,7 @@ package fr.ifremer.wao.entity; import org.apache.commons.lang3.builder.ToStringBuilder; +import org.nuiton.i18n.I18n; public class TerrestrialLocationImpl extends TerrestrialLocationAbstract { @@ -42,8 +43,7 @@ public String getDistrictName() { String districtName = super.getDistrictName(); if (districtName == null) { - // districtName = WaoUtils._("wao.business.other"); - throw new UnsupportedOperationException(); + districtName = I18n.t("wao.business.other"); } return districtName; } Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-02-28 17:37:02 UTC (rev 1708) @@ -136,3 +136,4 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Small pelagic fr.ifremer.wao.entity.TerrestrialDivision=Terrestrial divisions fr.ifremer.wao.entity.TerrestrialLocation=Terrestrial locations +wao.business.other= Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-02-28 17:37:02 UTC (rev 1708) @@ -136,3 +136,4 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits pélagiques fr.ifremer.wao.entity.TerrestrialDivision=Stratification géographique fr.ifremer.wao.entity.TerrestrialLocation=Lieux terrestres +wao.business.other= Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ReferentialService.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ReferentialService.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -26,12 +26,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatGroup; import fr.ifremer.wao.entity.BoatGroupTopiaDao; -import fr.ifremer.wao.entity.BoatGroups; import fr.ifremer.wao.entity.BoatTopiaDao; import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.ContactStateMotif; @@ -43,7 +41,6 @@ import fr.ifremer.wao.entity.FishingZoneTopiaDao; import fr.ifremer.wao.entity.Fleet; import fr.ifremer.wao.entity.FleetTopiaDao; -import fr.ifremer.wao.entity.Fleets; import fr.ifremer.wao.entity.LocationType; import fr.ifremer.wao.entity.ObsDebCode; import fr.ifremer.wao.entity.ObsDebCodeDetails; @@ -59,7 +56,6 @@ import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.entity.ShipOwner; import fr.ifremer.wao.entity.ShipOwnerTopiaDao; -import fr.ifremer.wao.entity.ShipOwners; import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.entity.TargetSpeciesDCFTopiaDao; import fr.ifremer.wao.entity.TerrestrialDivision; @@ -857,14 +853,14 @@ FleetTopiaDao fleetDao = getPersistenceContext().getFleetDao(); // load data that will be linked to the boat - Map<String, ShipOwner> shipOwners = - Maps.uniqueIndex( - shipOwnerDao.findAll(), - ShipOwners.getCode()); - Map<String, Fleet> fleets = - Maps.uniqueIndex( - fleetDao.findAll(), - Fleets.getCode()); + Map<String, ShipOwner> shipOwners = new HashMap<>(); + for (ShipOwner shipOwner : shipOwnerDao.findAll()) { + shipOwners.put(shipOwner.getCode(), shipOwner); + } + Map<String, Fleet> fleets = new HashMap<>(); + for (Fleet fleet : fleetDao.findAll()) { + fleets.put(fleet.getCode(), fleet); + } // now iterating over the lines of the CSV try { @@ -931,12 +927,12 @@ // Getting some DAOs BoatTopiaDao boatDao = getPersistenceContext().getBoatDao(); - BoatGroupTopiaDao boatGroupDAO = getPersistenceContext().getBoatGroupDao(); + BoatGroupTopiaDao boatGroupDao = getPersistenceContext().getBoatGroupDao(); - Map<String, BoatGroup> boatGroups = - Maps.uniqueIndex( - boatGroupDAO.findAll(), - BoatGroups.getCode()); + Map<String, BoatGroup> boatGroups = new HashMap<>(); + for (BoatGroup boatGroup : boatGroupDao.findAll()) { + boatGroups.put(boatGroup.getCode(), boatGroup); + } // now iterating over the lines of the CSV try { @@ -949,7 +945,7 @@ } else { BoatGroup boatGroup = boatGroups.get(boatGroupCode); if (boatGroup == null) { - boatGroup = boatGroupDAO.create(boat.getBoatGroup()); + boatGroup = boatGroupDao.create(boat.getBoatGroup()); boatGroups.put(boatGroupCode, boatGroup); } boat.setBoatGroup(boatGroup); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Boats; @@ -31,12 +32,11 @@ import java.text.ParseException; import java.util.List; -import java.util.Map; /** Parse a boat (identification based on the immatriculation) */ public class BoatParserFormatter implements ValueParserFormatter<Boat> { - protected Map<Integer, Boat> indexedBoats; + protected ImmutableMap<Integer, Boat> indexedBoats; public BoatParserFormatter(List<Boat> boats) { indexedBoats = Maps.uniqueIndex(boats, Boats.getImmatriculation()); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/CompanyParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/CompanyParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/CompanyParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.Companies; import fr.ifremer.wao.entity.Company; @@ -31,14 +32,13 @@ import java.text.ParseException; import java.util.List; -import java.util.Map; /** Parse a company according to it's name. */ public class CompanyParserFormatter implements ValueParserFormatter<Company> { protected List<Company> companies; - protected Map<String, Company> indexedCompanies; + protected ImmutableMap<String, Company> indexedCompanies; public CompanyParserFormatter(List<Company> companies) { this.companies = companies; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateMotivesParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateMotivesParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateMotivesParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.ContactStateMotif; import fr.ifremer.wao.entity.ContactStateMotives; @@ -32,13 +33,12 @@ import java.text.ParseException; import java.util.List; -import java.util.Map; public class ContactStateMotivesParserFormatter implements ValueParserFormatter<ContactStateMotif> { protected List<ContactStateMotif> motives; - protected Map<String, ContactStateMotif> indexedMotives; + protected ImmutableMap<String, ContactStateMotif> indexedMotives; public ContactStateMotivesParserFormatter(List<ContactStateMotif> motives) { this.motives = motives; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.FishingZones; @@ -33,14 +34,13 @@ import java.text.ParseException; import java.util.LinkedList; import java.util.List; -import java.util.Map; /** * Consiste en plusieurs codes de zones de pêches séparés par des " / ". */ public class FishingZonesParserFormatter implements ValueParserFormatter<List<FishingZone>> { - protected Map<String, FishingZone> indexedFishingZones; + protected ImmutableMap<String, FishingZone> indexedFishingZones; protected List<FishingZone> fishingZones; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObsDebCodeParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObsDebCodeParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObsDebCodeParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.ObsDebCode; import fr.ifremer.wao.entity.ObsDebCodes; @@ -32,11 +33,10 @@ import java.text.ParseException; import java.util.List; -import java.util.Map; public class ObsDebCodeParserFormatter implements ValueParserFormatter<ObsDebCode> { - protected Map<String, ObsDebCode> indexedObsDebCodes; + protected ImmutableMap<String, ObsDebCode> indexedObsDebCodes; protected List<ObsDebCode> obsDebCodes; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/PortParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/PortParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/PortParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.TerrestrialLocations; @@ -30,7 +31,6 @@ import org.nuiton.csv.ValueParserFormatter; import java.util.List; -import java.util.Map; public class PortParserFormatter implements ValueParserFormatter<TerrestrialLocation> { @@ -39,7 +39,7 @@ * and all the values must have {@link fr.ifremer.wao.entity.TerrestrialLocation#getLocationType()} at * {@link fr.ifremer.wao.entity.LocationType#PORT}. */ - protected Map<String, TerrestrialLocation> ports; + protected ImmutableMap<String, TerrestrialLocation> ports; protected boolean allowNullValue; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.TerrestrialLocations; @@ -30,13 +31,12 @@ import java.text.ParseException; import java.util.List; -import java.util.Map; public class RegionParserFormatter implements ValueParserFormatter<TerrestrialLocation> { protected List<TerrestrialLocation> regions; - protected Map<String, TerrestrialLocation> indexedRegions; + protected ImmutableMap<String, TerrestrialLocation> indexedRegions; public RegionParserFormatter(List<TerrestrialLocation> regions) { this.regions = regions; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.TerrestrialLocations; @@ -31,13 +32,12 @@ import java.text.ParseException; import java.util.LinkedList; import java.util.List; -import java.util.Map; public class RegionsParser implements ValueParser<List<TerrestrialLocation>> { protected List<TerrestrialLocation> regions; - protected Map<String, TerrestrialLocation> indexedRegions; + protected ImmutableMap<String, TerrestrialLocation> indexedRegions; public RegionsParser(List<TerrestrialLocation> regions) { this.regions = regions; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRows; @@ -32,11 +33,10 @@ import java.text.ParseException; import java.util.List; -import java.util.Map; public class SampleRowParserFormatter implements ValueParserFormatter<SampleRow> { - protected Map<String, SampleRow> indexedSampleRows; + protected ImmutableMap<String, SampleRow> indexedSampleRows; public SampleRowParserFormatter(List<SampleRow> sampleRows) { indexedSampleRows = Maps.uniqueIndex(sampleRows, SampleRows.getCode()); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -24,6 +24,7 @@ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.entity.WaoUsers; @@ -32,12 +33,11 @@ import java.text.ParseException; import java.util.List; -import java.util.Map; public class UserParserFormatter implements ValueParserFormatter<WaoUser> { /** all waoUsers in the database when import was started, indexed by logins */ - protected Map<String, WaoUser> indexedWaoUsers; + protected ImmutableMap<String, WaoUser> indexedWaoUsers; public UserParserFormatter(List<WaoUser> waoUsers) { this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.services.service.csv.operations; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import fr.ifremer.wao.entity.WaoUser; @@ -34,14 +35,13 @@ import java.text.ParseException; import java.util.LinkedList; import java.util.List; -import java.util.Map; public class UsersParserFormatter implements ValueParserFormatter<List<WaoUser>> { protected static final String SEPARATOR = ","; /** all waoUsers in the database when import was started, indexed by logins */ - protected Map<String, WaoUser> indexedWaoUsers; + protected ImmutableMap<String, WaoUser> indexedWaoUsers; public UsersParserFormatter(List<WaoUser> waoUsers) { this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); Added: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ReferentialServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ReferentialServiceTest.java (rev 0) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ReferentialServiceTest.java 2014-02-28 17:37:02 UTC (rev 1708) @@ -0,0 +1,142 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.services.AbstractWaoServiceTest; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.io.InputStream; +import java.util.Date; + +public class ReferentialServiceTest extends AbstractWaoServiceTest { + + private static final Log log = LogFactory.getLog(ReferentialServiceTest.class); + + protected ReferentialService service; + + @Before + public void setUp() { + getServiceContext().setDate(new Date(1393607049651l)); + service = newService(ReferentialService.class); + } + + @Test + public void testImportFishingZones() { + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/zonesPeche.csv"); + service.importFishingZones(input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + } + + @Test + public void testImportTerrestrialLocations() { + InputStream input = null; + try { + input = getClass().getResourceAsStream("/terrestrialLocations.csv"); + service.importTerrestrialLocations(input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + } + + @Test + public void testImportContactStateMotives() { + testImportTerrestrialLocations(); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/motifs.csv"); + service.importContactStateMotives(input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + } + + @Test + public void testImportTerrestrialDivisions() { + testImportTerrestrialLocations(); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/purifiedTerrestrialDivisions.csv"); + service.importTerrestrialDivisions(input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + } + + @Test + public void testImportObsDebCodes() { + testImportTerrestrialLocations(); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/obsDebCodes.csv"); + service.importObsDebCodes(input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + } + + @Test + public void testImportBoats() { + testImportTerrestrialLocations(); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/navires.csv"); + service.importBoats(input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + } + + @Test + public void testImportBoatGroups() { + testImportBoats(); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/strates.csv"); + service.importBoatGroups(input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + } +} Property changes on: trunk/wao-services/src/test/resources/import ___________________________________________________________________ Added: svn:ignore + .~lock.echantillonnage.csv# Added: svn:mergeinfo + /branches/wao-1.5.x/wao-business/src/test/resources/import:679-733 Deleted: trunk/wao-services/src/test/resources/import/activity.csv =================================================================== --- tags/wao-3.4.1/wao-business/src/test/resources/import/activity.csv 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/test/resources/import/activity.csv 2014-02-28 17:37:02 UTC (rev 1708) @@ -1,9 +0,0 @@ -"","SYNA_DATED","SYNA_DATEF","SYNA_AN","SYNA_MOI","ENQ_ID","INDQ_COD","CATD_COD","NAVS_COD","SYNA_NOMJDM","SYNA_NOMJDP","SYNA_NOMHE","SYNA_TPOR_COD","SYNA_POR_COD","SYNA_POR_LIB","SYNA_QUA_COD","SYNA_QUA_LIB","META_ORDRE","ORII_COD","ORII_COURT_LIB","MET_ID","MET_COD","MET_LIB","GRA_COD","GRA_LIB","TSECT_COD","SECT_COD","SECT_LIB","zone","MET5","VIId" -"1286","2008-02-01 00:00:00","2008-02-29 00:00:00","2008","02","932766","2","1","273129","12","11","4","6","XGV","Le Guilvinec","GV","Le Guilvinec","1","9","CNTS/M","193","OTBGA","Chalut de fond à panneaux (1 nav.) à divers gadidés","11","Etranger","13","31E3","Rectangle 31E3","CELT","OTB_DEF",FALSE -"1287","2008-02-01 00:00:00","2008-02-29 00:00:00","2008","02","932766","2","1","273129","12","11","4","6","XGV","Le Guilvinec","GV","Le Guilvinec","1","9","CNTS/M","193","OTBGA","Chalut de fond à panneaux (1 nav.) à divers gadidés","11","Etranger","13","31E2","Rectangle 31E2","CELT","OTB_DEF",FALSE -"1288","2008-07-01 00:00:00","2008-07-31 00:00:00","2008","07","914020","1","1","177474","10",NA,"3","6","XGV","Le Guilvinec","GV","Le Guilvinec","1","9","CNTS/M","307","TTBLN","Chaluts jumeaux à langoustines, galathées","16","Mixte","13","24E4","Rectangle 24E4","GASC","OTT_CRU",FALSE -"24431","2008-10-01 00:00:00","2008-10-31 00:00:00","2008","10","968329","1","1","174592","15","15","4","6","ACN","Honfleur","CN","Caen","2","9","CNTS/M","211","OTBSO","Chalut de fond à panneaux (1 nav.) à soles","9","Côtier","14","27E930","Extérieur des 3 milles de Ouistreham à Villers/mer","NSEC","OTB_DEF",TRUE -"24432","2008-08-01 00:00:00","2008-08-31 00:00:00","2008","08","967774","2","1","284595","4","4","3","6","ACN","Honfleur","CN","Caen","1","9","CNTS/M","211","OTBSO","Chalut de fond à panneaux (1 nav.) à soles","9","Côtier","14","27E930","Extérieur des 3 milles de Ouistreham à Villers/mer","NSEC","OTB_DEF",TRUE -"24433","2008-09-01 00:00:00","2008-09-30 00:00:00","2008","09","966415","2","1","177474",NA,"8",NA,"6","ACN","Honfleur","CN","Caen","1","9","CNTS/M","211","OTBSO","Chalut de fond à panneaux (1 nav.) à soles","9","Côtier","14","27E930","Extérieur des 3 milles de Ouistreham à Villers/mer","NSEC","OTB_DEF",TRUE -"24434","2008-08-01 00:00:00","2008-08-31 00:00:00","2008","08","968272","1","1","978419","25","25","4","6","ACN","Honfleur","CN","Caen","1","9","CNTS/M","211","OTBSO","Chalut de fond à panneaux (1 nav.) à soles","9","Côtier","14","27E930","Extérieur des 3 milles de Ouistreham à Villers/mer","NSEC","OTB_DEF",TRUE -"43134","2008-05-01 00:00:00","2008-05-31 00:00:00","2008","05","961088","3","1","174592",NA,NA,"1","6","INA","Trentemoult (Nantes)",NA,"Nantes","1","7","ENQUETEUR","344","GNSLM","Filet maillant fixe à lamproie marine","9","Côtier","14","23E7L5","Loire domaine mixte lot 15","GASC","GNS_CAT",FALSE \ No newline at end of file Deleted: trunk/wao-services/src/test/resources/import/activity.csv.gz =================================================================== (Binary files differ) Deleted: trunk/wao-services/src/test/resources/import/boat_districts.kml =================================================================== --- tags/wao-3.4.1/wao-business/src/test/resources/import/boat_districts.kml 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/test/resources/import/boat_districts.kml 2014-02-28 17:37:02 UTC (rev 1708) @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> - - -<kml xmlns="http://www.opengis.net/kml/2.2"> - <Document> - <Folder> - <name>IFR_SIH_QUARTIER_MAR_PT</name> - <Schema name="IFR_SIH_QUARTIER_MAR_PT" id="IFR_SIH_QUARTIER_MAR_PT"> - <SimpleField name="Name" type="string"></SimpleField> - <SimpleField name="Description" type="string"></SimpleField> - <SimpleField name="OBJECTID" type="int"></SimpleField> - <SimpleField name="LIEU_LIB" type="string"></SimpleField> - <SimpleField name="LIEU_COD" type="string"></SimpleField> - <SimpleField name="TLIEU_COD" type="int"></SimpleField> - <SimpleField name="L_OCEAN" type="string"></SimpleField> - <SimpleField name="L_PAYS" type="string"></SimpleField> - </Schema> - <Placemark> - <name>34</name> - <description>Sete</description> - <ExtendedData> - <SchemaData schemaUrl="#IFR_SIH_QUARTIER_MAR_PT"> - <SimpleData name="Name">2</SimpleData> - <SimpleData name="Description">Unio</SimpleData> - <SimpleData name="OBJECTID">PV</SimpleData> - <SimpleData name="LIEU_LIB">13</SimpleData> - <SimpleData name="LIEU_COD">ME</SimpleData> - <SimpleData name="TLIEU_COD">FRA</SimpleData> - <SimpleData name="L_OCEAN">0</SimpleData> - <SimpleData name="L_PAYS">POINT</SimpleData> - </SchemaData> - </ExtendedData> - <Point> - <coordinates>3.697544304924308,43.400978635376085 - </coordinates> - </Point> - </Placemark> - <Placemark> - <name>30</name> - <description>Martigues</description> - <ExtendedData> - <SchemaData schemaUrl="#IFR_SIH_QUARTIER_MAR_PT"> - <SimpleData name="Name">30</SimpleData> - <SimpleData name="Description">Uxirgue</SimpleData> - <SimpleData name="OBJECTID">DP</SimpleData> - <SimpleData name="LIEU_LIB">13</SimpleData> - <SimpleData name="LIEU_COD">ME</SimpleData> - <SimpleData name="TLIEU_COD">FRA</SimpleData> - <SimpleData name="L_OCEAN">1</SimpleData> - <SimpleData name="L_PAYS">POINT</SimpleData> - </SchemaData> - </ExtendedData> - <Point> - <coordinates>5.05084975227851,43.405830559005189 - </coordinates> - </Point> - </Placemark> - <Placemark> - <name>29</name> - <description>Marseille</description> - <ExtendedData> - <SchemaData schemaUrl="#IFR_SIH_QUARTIER_MAR_PT"> - <SimpleData name="Name">29</SimpleData> - <SimpleData name="Description">Civik</SimpleData> - <SimpleData name="OBJECTID">FK</SimpleData> - <SimpleData name="LIEU_LIB">13</SimpleData> - <SimpleData name="LIEU_COD">ME</SimpleData> - <SimpleData name="TLIEU_COD">FRA</SimpleData> - <SimpleData name="L_OCEAN">2</SimpleData> - <SimpleData name="L_PAYS">POINT</SimpleData> - </SchemaData> - </ExtendedData> - <Point> - <coordinates>5.351948092148461,43.323330380088101 - </coordinates> - </Point> - </Placemark> - </Folder> - </Document> -</kml> Deleted: trunk/wao-services/src/test/resources/import/dates.csv =================================================================== --- tags/wao-3.4.1/wao-business/src/test/resources/import/dates.csv 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/test/resources/import/dates.csv 2014-02-28 17:37:02 UTC (rev 1708) @@ -1,2 +0,0 @@ -DATE_1,DATE_2,DATE_3,DATE_4 -10/02/2010,10/02/10,02/2010,10/02/10 \ No newline at end of file Deleted: trunk/wao-services/src/test/resources/import/misc.csv =================================================================== --- tags/wao-3.4.1/wao-business/src/test/resources/import/misc.csv 2014-02-28 16:53:44 UTC (rev 1707) +++ trunk/wao-services/src/test/resources/import/misc.csv 2014-02-28 17:37:02 UTC (rev 1708) @@ -1,5 +0,0 @@ -PLAN_CODE -2009_M1 -2009_M11 -2009_M111 -2009_M1111 \ No newline at end of file

1 0

r1707 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations
by bleny＠users.forge.codelutin.com 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 17:53:44 +0100 (Fri, 28 Feb 2014) New Revision: 1707 Url: http://codelutin.com/projects/wao/repository/revisions/1707 Log: refs #4482 prevent NPE when indexing boat districts Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java 2014-02-28 16:52:18 UTC (rev 1706) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) @@ -25,13 +25,12 @@ */ -import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.entity.TerrestrialLocations; import org.nuiton.csv.ValueParserFormatter; import org.nuiton.i18n.I18n; import java.text.ParseException; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -41,12 +40,14 @@ public DistrictParserFormatter(List<TerrestrialLocation> districts) { if (districts != null) { + indexedDistricts = new HashMap<>(); for (TerrestrialLocation district : districts) { if ( ! district.isDistrict()) { throw new IllegalArgumentException(); } + indexedDistricts.put(district.getDistrictCode(), district); } - indexedDistricts = Maps.uniqueIndex(districts, TerrestrialLocations.getDistrictCode()); + // XXX brendan 28/02/14 on utilise pas Maps.uniqueIndex car la clé peut être null (quartier maritime « Hors France ») } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-02-28 16:52:18 UTC (rev 1706) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-02-28 16:53:44 UTC (rev 1707) @@ -23,15 +23,14 @@ */ package fr.ifremer.wao.services.service.csv.operations; -import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.entity.TerrestrialLocations; import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.ValueParserFormatter; import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.Collection; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -41,14 +40,14 @@ protected Map<String, TerrestrialLocation> indexedDistricts; public DistrictsParserFormatter(List<TerrestrialLocation> districts) { - if (districts != null) { - for (TerrestrialLocation district : districts) { - if ( ! district.isDistrict()) { - throw new IllegalArgumentException(); - } + indexedDistricts = new HashMap<>(); + for (TerrestrialLocation district : districts) { + if ( ! district.isDistrict()) { + throw new IllegalArgumentException(); } - indexedDistricts = Maps.uniqueIndex(districts, TerrestrialLocations.getDistrictCode()); + indexedDistricts.put(district.getDistrictCode(), district); } + // XXX brendan 28/02/14 on utilise pas Maps.uniqueIndex car la clé peut être null (quartier maritime « Hors France ») } @Override

1 0

r1706 - trunk/wao-services/src/test/java/fr/ifremer/wao/services
by bleny＠users.forge.codelutin.com 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 17:52:18 +0100 (Fri, 28 Feb 2014) New Revision: 1706 Url: http://codelutin.com/projects/wao/repository/revisions/1706 Log: prevent release failure by waiting infinitly for H2 unlocking while testing Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java 2014-02-28 16:51:05 UTC (rev 1705) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java 2014-02-28 16:52:18 UTC (rev 1706) @@ -128,21 +128,17 @@ File lockFile = new File(databaseRefFile, "h2data.lock.db"); - int countWaiting = 0; - - while (lockFile.exists() && countWaiting < 25) { + while (lockFile.exists()) { + if (log.isDebugEnabled()) { + log.debug("referential database is still locked, will wait 5 more seconds"); + } try { - Thread.sleep(200); + Thread.sleep(5 * 1000); } catch (InterruptedException e) { throw new WaoTechnicalException("can't wait", e); } - countWaiting++; } - if (lockFile.exists()) { - throw new WaoTechnicalException("database ref is not close after 5 seconds !"); - } - } File databaseFile = new File(tempDirFile, databaseName);

1 0

r1705 - trunk/wao-services/src/test/resources
by bleny＠users.forge.codelutin.com 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 17:51:05 +0100 (Fri, 28 Feb 2014) New Revision: 1705 Url: http://codelutin.com/projects/wao/repository/revisions/1705 Log: configure logging for tests Added: trunk/wao-services/src/test/resources/log4j.properties Added: trunk/wao-services/src/test/resources/log4j.properties =================================================================== --- trunk/wao-services/src/test/resources/log4j.properties (rev 0) +++ trunk/wao-services/src/test/resources/log4j.properties 2014-02-28 16:51:05 UTC (rev 1705) @@ -0,0 +1,15 @@ +log4j.rootCategory=WARN, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n + +# global level +log4j.logger.fr.ifremer.wao=TRACE + +### persistence level +# log4j.logger.org.nuiton.topia=TRACE +# log4j.logger.fr.gouv.social.encahi.extranet.persistence=TRACE + +### services level +# log4j.logger.fr.ifremer.wao.services=TRACE

1 0

r1704 - trunk/wao-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 17:50:03 +0100 (Fri, 28 Feb 2014) New Revision: 1704 Url: http://codelutin.com/projects/wao/repository/revisions/1704 Log: rename model and tagValues to prevent classpath conflict Added: trunk/wao-persistence/src/main/xmi/wao-model.properties trunk/wao-persistence/src/main/xmi/wao-model.zargo Removed: trunk/wao-persistence/src/main/xmi/wao.properties trunk/wao-persistence/src/main/xmi/wao.zargo Copied: trunk/wao-persistence/src/main/xmi/wao-model.properties (from rev 1679, trunk/wao-persistence/src/main/xmi/wao.properties) =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties (rev 0) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-02-28 16:50:03 UTC (rev 1704) @@ -0,0 +1,73 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +model.tagValue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ +model.tagValue.java.lang.String=text +model.tagValue.exceptionClass=fr.ifremer.wao.WaoException +model.tagValue.notGenerateToString=true +model.tagValue.constantPrefix=PROPERTY_ +model.tagValue.useEnumerationName=true +model.tagValue.indexForeignKeys=true + +# model.tagValue.doNotGenerateBooleanGetMethods=true + +#model.tagValue.useLegacyDAO=true + +fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagValue.lazy=false + +fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate +fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.orderBy=facadeName,sectorName,districtCode +fr.ifremer.wao.entity.SampleRow.attribute.company.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.profession.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagValue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagValue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.orderBy=companyActive +#fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.orderBy=topiaCreateDate desc + +fr.ifremer.wao.entity.SampleRowLog.attribute.author.tagValue.lazy=false + +fr.ifremer.wao.entity.FishingZone.attribute.sampleRow.tagValue.orderBy=code + +#fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagValue.lazy=false +fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy=false +fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.orderBy=companyActive + +fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagValue.lazy=false + +fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagValue.lazy=false +fr.ifremer.wao.entity.Contact.attribute.boat.tagValue.lazy=false + +fr.ifremer.wao.entity.TerrestrialDivision.attribute.regionIfremer.tagValue.lazy=false + +fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.lazy=false +fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagValue.lazy=false +fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.orderBy=level + +fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false +fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true + +fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique=true Copied: trunk/wao-persistence/src/main/xmi/wao-model.zargo (from rev 1689, trunk/wao-persistence/src/main/xmi/wao.zargo) =================================================================== (Binary files differ) Deleted: trunk/wao-persistence/src/main/xmi/wao.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao.properties 2014-02-28 16:10:56 UTC (rev 1703) +++ trunk/wao-persistence/src/main/xmi/wao.properties 2014-02-28 16:50:03 UTC (rev 1704) @@ -1,73 +0,0 @@ -### -# #%L -# Wao :: Business -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -model.tagValue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ -model.tagValue.java.lang.String=text -model.tagValue.exceptionClass=fr.ifremer.wao.WaoException -model.tagValue.notGenerateToString=true -model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.useEnumerationName=true -model.tagValue.indexForeignKeys=true - -# model.tagValue.doNotGenerateBooleanGetMethods=true - -#model.tagValue.useLegacyDAO=true - -fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagValue.lazy=false - -fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate -fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.orderBy=facadeName,sectorName,districtCode -fr.ifremer.wao.entity.SampleRow.attribute.company.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.profession.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagValue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagValue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagValue.lazy=false -#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.orderBy=companyActive -#fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.orderBy=topiaCreateDate desc - -fr.ifremer.wao.entity.SampleRowLog.attribute.author.tagValue.lazy=false - -fr.ifremer.wao.entity.FishingZone.attribute.sampleRow.tagValue.orderBy=code - -#fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagValue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.orderBy=companyActive - -fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagValue.lazy=false - -fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagValue.lazy=false -fr.ifremer.wao.entity.Contact.attribute.boat.tagValue.lazy=false - -fr.ifremer.wao.entity.TerrestrialDivision.attribute.regionIfremer.tagValue.lazy=false - -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.lazy=false -fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagValue.lazy=false -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.orderBy=level - -fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false -fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true - -fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique=true Deleted: trunk/wao-persistence/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

r1703 - in trunk/wao-web/src/main/webapp/WEB-INF: content/obsmer decorators
by bleny＠users.forge.codelutin.com 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 17:10:56 +0100 (Fri, 28 Feb 2014) New Revision: 1703 Url: http://codelutin.com/projects/wao/repository/revisions/1703 Log: use s:text everywhere Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-02-28 16:06:46 UTC (rev 1702) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-02-28 16:10:56 UTC (rev 1703) @@ -16,11 +16,11 @@ <div class="form-actions"> <s:url action="news" id="newsUrl" /> <s:a href="%{newsUrl}" cssClass="btn"> - <s:property value="getText('wao.ui.action.cancel')" /> + <s:text name="wao.ui.action.cancel" /> </s:a> <s:submit type="button" cssClass="btn"> - <s:property value="getText('wao.ui.action.save')" /> + <s:text name="wao.ui.action.save" /> </s:submit> </div> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-02-28 16:06:46 UTC (rev 1702) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-02-28 16:10:56 UTC (rev 1703) @@ -35,14 +35,14 @@ <s:param name="newsId" value="topiaId" /> </s:url> <s:a href="%{editNewsUrl}"> - <s:property value="getText('wao.ui.action.edit')" /> + <s:text name="wao.ui.action.edit" /> </s:a> <s:url action="delete-news" id="deleteNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> <s:a href="%{deleteNewsUrl}"> - <s:property value="getText('wao.ui.action.delete')" /> + <s:text name="wao.ui.action.delete" /> </s:a> </div> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-02-28 16:06:46 UTC (rev 1702) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-02-28 16:10:56 UTC (rev 1703) @@ -29,45 +29,45 @@ <li class="active"> <s:url action="news" id="newsUrl" /> <s:a href="%{newsUrl}"> - <s:property value="getText('wao.ui.page.Index.title')" /> + <s:text name="wao.ui.page.Index.title" /> </s:a> </li> <li> <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}"> - <s:property value="getText('wao.ui.page.SamplingPlan.title')" /> + <s:text name="wao.ui.page.SamplingPlan.title" /> </s:a> </li> <li> <s:url action="boats" id="boatsUrl" /> <s:a href="%{boatsUrl}"> - <s:property value="getText('wao.ui.page.Boats.title')" /> + <s:text name="wao.ui.page.Boats.title" /> </s:a> </li> <li> <s:url action="contacts" id="contactsUrl" /> <s:a href="%{contactsUrl}"> - <s:property value="getText('wao.ui.page.Contacts.title')" /> + <s:text name="wao.ui.page.Contacts.title" /> </s:a> </li> <li> <s:url action="synthesis" id="synthesisUrl" /> <s:a href="%{synthesisUrl}"> - <s:property value="getText('wao.ui.page.Synthesis.title')" /> + <s:text name="wao.ui.page.Synthesis.title" /> </s:a> </li> </ul> <ul class="nav pull-right"> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - <s:property value="getText('wao.ui.page.Administration.title')" /> + <s:text name="wao.ui.page.Administration.title" /> </a> <ul class="dropdown-menu"> <li> <s:url namespace="/administration" action="referential-management" id="referentialManagementUrl" /> <s:a href="%{referentialManagementUrl}"> - <s:property value="getText('wao.ui.page.ReferentialManagement.title')" /> + <s:text name="wao.ui.page.ReferentialManagement.title" /> </s:a> </li> </ul> @@ -90,14 +90,14 @@ </s:param> </s:url> <s:a href="%{changeLocaleUrl}"> - <s:property value="getText('wao.ui.action.changeLocale')" /> + <s:text name="wao.ui.action.changeLocale" /> </s:a> </li> <li> - <a href="#"> <s:property value="getText('wao.ui.page.UserProfileForm.title')" /></a> + <a href="#"> <s:text name="wao.ui.page.UserProfileForm.title" /></a> </li> <li> - <a href="#"> <s:property value="getText('wao.ui.action.logout')" /></a> + <a href="#"> <s:text name="wao.ui.action.logout" /></a> </li> </ul> </li> @@ -149,7 +149,7 @@ </ul> <s:if test="obsMer"> - <s:property value="getText('wao.ui.disclaimer')" /> + <s:text name="wao.ui.disclaimer" /> </s:if> </footer>

1 0