January 2013 - Coser-commits - mailman.cloud.codelutin.com

r1104 - in trunk: coser-business/src/license coser-ui/src/license coser-web/src/license
by echatellier＠users.forge.codelutin.com Jan. 29, 2013

Jan. 29, 2013

Author: echatellier Date: 2013-01-29 16:13:11 +0100 (Tue, 29 Jan 2013) New Revision: 1104 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1104 Log: Update thrid party Modified: trunk/coser-business/src/license/THIRD-PARTY.properties trunk/coser-ui/src/license/THIRD-PARTY.properties trunk/coser-web/src/license/THIRD-PARTY.properties Modified: trunk/coser-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-business/src/license/THIRD-PARTY.properties 2013-01-29 14:40:57 UTC (rev 1103) +++ trunk/coser-business/src/license/THIRD-PARTY.properties 2013-01-29 15:13:11 UTC (rev 1104) @@ -4,11 +4,11 @@ # - Apache License # - Apache Software License, Version 2.0 # - BSD License -# - BSD style # - BSD-style license # - Bouncy Castle License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Affero General Public License v3 # - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -17,11 +17,13 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - Mozilla Public License +# - New BSD License # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Aug 14 16:22:07 CEST 2012 +#Tue Jan 29 16:06:34 CET 2013 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/coser-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-ui/src/license/THIRD-PARTY.properties 2013-01-29 14:40:57 UTC (rev 1103) +++ trunk/coser-ui/src/license/THIRD-PARTY.properties 2013-01-29 15:13:11 UTC (rev 1104) @@ -4,11 +4,11 @@ # - Apache License # - Apache Software License, Version 2.0 # - BSD License -# - BSD style # - BSD-style license # - Bouncy Castle License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Affero General Public License v3 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 @@ -20,15 +20,17 @@ # - License Agreement for JavaMail(TM) API # - MIT License # - Mozilla Public License +# - New BSD License # - OpenMap Software License Agreement # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Aug 14 15:41:41 CEST 2012 +#Tue Jan 29 15:44:52 CET 2013 commons-jxpath--commons-jxpath--1.3=Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API org.apache.commons--commons-email--1.2=Apache Software License, Version 2.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/coser-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-web/src/license/THIRD-PARTY.properties 2013-01-29 14:40:57 UTC (rev 1103) +++ trunk/coser-web/src/license/THIRD-PARTY.properties 2013-01-29 15:13:11 UTC (rev 1104) @@ -7,6 +7,7 @@ # - BSD-style license # - Bouncy Castle License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - GNU Affero General Public License v3 # - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -22,7 +23,8 @@ # Please fill the missing licenses for dependencies : # # -#Tue Aug 14 16:31:46 CEST 2012 +#Tue Jan 29 16:10:36 CET 2013 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes +regexp--regexp--1.3=The Apache Software License, Version 2.0

1 0

r1103 - trunk/coser-ui/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com Jan. 29, 2013

Jan. 29, 2013

Author: echatellier Date: 2013-01-29 15:40:57 +0100 (Tue, 29 Jan 2013) New Revision: 1103 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1103 Log: fixes #1770: Titre ?\195?\160 harmoniser Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2013-01-29 14:35:47 UTC (rev 1102) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2013-01-29 14:40:57 UTC (rev 1103) @@ -275,7 +275,7 @@ coser.ui.selection.selectionValidated=Selection validated and saved. coser.ui.selection.selectionreport=Selection report coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) -coser.ui.selection.speciesMenuFusion=Merge +coser.ui.selection.speciesMenuFusion=Merge/Rename coser.ui.selection.speciesMerged=Species merged. coser.ui.selection.speciesRenamed=Species renamed. coser.ui.selection.tab.details=Selection details Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2013-01-29 14:35:47 UTC (rev 1102) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2013-01-29 14:40:57 UTC (rev 1103) @@ -275,7 +275,7 @@ coser.ui.selection.selectionValidated=Sélection validée et sauvée. coser.ui.selection.selectionreport=Rapport de la sélection coser.ui.selection.sizeAllYearSpecies=L3 \: Espèces avec taille pour toutes les années (%d/%d) -coser.ui.selection.speciesMenuFusion=Fusion +coser.ui.selection.speciesMenuFusion=Fusion/Renommage coser.ui.selection.speciesMerged=Espèces fusionnées. coser.ui.selection.speciesRenamed=Espèce renommée. coser.ui.selection.tab.details=Détails de la sélection

1 0

r1102 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Jan. 29, 2013

Jan. 29, 2013

Author: echatellier Date: 2013-01-29 15:35:47 +0100 (Tue, 29 Jan 2013) New Revision: 1102 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1102 Log: fixes #1928: G?\195?\169n?\195?\169ration d'un pdf par campagne Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2013-01-29 11:01:20 UTC (rev 1101) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2013-01-29 14:35:47 UTC (rev 1102) @@ -2533,18 +2533,17 @@ extractSource(zones, srcDir); } - // les cartes et des graphiques doivent se retroiver dans le pdf + // les cartes doivent se retrouver dans le pdf MultiKeyMap pdfMaps = null; if (types.contains(DataType.MAP)) { if (log.isDebugEnabled()) { log.debug("Extracting maps"); } - File mapDir = new File(subDir, "maps"); - pdfMaps = extractDataMap(zones, species, mapDir); + pdfMaps = extractDataMap(zones, species); } // les graphiques sont également dans le pdf - Map<String, Object[]> pdfCharts = null; + MultiKeyMap pdfCharts = null; if (CollectionUtils.isNotEmpty(comIndicators) || CollectionUtils.isNotEmpty(popIndicators)) { if (log.isDebugEnabled()) { log.debug("Extracting charts"); @@ -2554,8 +2553,7 @@ // generate pdf if necessary if (MapUtils.isNotEmpty(pdfMaps) || MapUtils.isNotEmpty(pdfCharts)) { - File pdfFile = new File(subDir, "Indicateurs_Ifremer.pdf"); - generateExtractPDF(pdfFile, pdfMaps, pdfCharts, locale); + generateExtractPDF(subDir, zones, pdfMaps, pdfCharts, locale); } // fichier de décharge en pdf @@ -2587,17 +2585,16 @@ } /** - * Extrait les cartes + * Extrait les cartes. * * @param zones zones (zoneid) * @param species species - * @param directory - * @return map file + * @return map file (zone/speciesname/mapfile) * @throws CoserBusinessException * @throws IOException * @since 1.4 */ - protected MultiKeyMap extractDataMap(Collection<String> zones, Collection<String> species, File directory) throws CoserBusinessException, IOException { + protected MultiKeyMap extractDataMap(Collection<String> zones, Collection<String> species) throws CoserBusinessException, IOException { MultiKeyMap mapForZoneAndSpecies = new MultiKeyMap(); @@ -2736,13 +2733,13 @@ * @param comIndicator comIndicator * @param popIndicators popIndicators * @param locale locale - * @return la liste des indicateurs + * @return la liste des indicateurs (zone, speciesname, [graphfile, graphdata]) * @throws CoserBusinessException */ - protected Map<String, Object[]> extractCharts(Collection<String> zones, Collection<String> species, + protected MultiKeyMap extractCharts(Collection<String> zones, Collection<String> species, Collection<String> comIndicators, Collection<String> popIndicators, Locale locale) throws CoserBusinessException { - Map<String, Object[]> chartFileAndDatas = new HashMap<String, Object[]>(); + MultiKeyMap chartFileAndDatas = new MultiKeyMap(); // parcours des resultats disponibles File projectsDirectory = config.getWebIndicatorsProjectsDirectory(); @@ -2775,7 +2772,8 @@ // load project (without data to get reftax data) Project project = projectService.openProject(projectFile.getName(), projectsDirectory); - String zoneDisplayName = getZoneFullName(rsufiResult.getZone()); + String zone = rsufiResult.getZone(); + String zoneDisplayName = getZoneFullName(zone); // le fichier contenant le code type espece (utile // pour les traductions des list d'indicateur) @@ -2785,15 +2783,20 @@ Map<String, Object[]> chartFileAndDataCom = publicationService.getRsufiResultComCharts(project, resultFile, rsufiResult, codeTypeEspecesFile, comIndicators, zoneDisplayName, getIndicatorsMap(), locale, 650, 430); - chartFileAndDatas.putAll(chartFileAndDataCom); + // put in multimap as zone,speciesname, data + for (Entry<String, Object[]> entry : chartFileAndDataCom.entrySet()) { + chartFileAndDatas.put(zone, entry.getKey(), entry.getValue()); + } } if (CollectionUtils.isNotEmpty(popIndicators)) { Map<String, Object[]> chartFileAndDataPop = publicationService.getRsufiResultPopCharts(project, resultFile, rsufiResult, species, popIndicators, zoneDisplayName, getIndicatorsMap(), locale, 650, 430); - - chartFileAndDatas.putAll(chartFileAndDataPop); + // put in multimap as zone,speciesname, data + for (Entry<String, Object[]> entry : chartFileAndDataPop.entrySet()) { + chartFileAndDatas.put(zone, entry.getKey(), entry.getValue()); + } } } } @@ -2812,99 +2815,91 @@ /** * Generate pdf file filled with maps and charts. * - * @param pdfFile pdf file to generate to + * @param directory directory to generate pdf to + * @param zones zones ids * @param pdfMaps pdf maps (can be {@code null}) * @param pdfCharts pdf charts (can be {@code null}) * @throws CoserBusinessException */ - protected void generateExtractPDF(File pdfFile, - MultiKeyMap pdfMaps, Map<String, Object[]> pdfCharts, Locale locale) throws CoserBusinessException { + protected void generateExtractPDF(File directory, List<String> zones, + MultiKeyMap pdfMaps, MultiKeyMap pdfCharts, Locale locale) throws CoserBusinessException { - Collection<File> toDelete = new ArrayList<File>(); - OutputStream os = null; + for (String zone : zones) { + Collection<File> toDelete = new ArrayList<File>(); + OutputStream os = null; - try { - StringBuilder htmlContent = new StringBuilder(); - htmlContent.append("<html><head>"); - htmlContent.append("<title>" + l_(locale, "coser.business.extract.extracttitle")+ "</title>"); - htmlContent.append("<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />"); - htmlContent.append("</head><body>"); - - if (pdfMaps != null) { - for (Entry<MultiKey, File> mapEntry : (Set<Entry<MultiKey, File>>)pdfMaps.entrySet()) { - String zoneId = (String)mapEntry.getKey().getKey(0); - String speciesName = (String)mapEntry.getKey().getKey(1); - File file = mapEntry.getValue(); - - String zoneName = getZoneFullName(zoneId); - htmlContent.append("<div style='page-break-after: always'>"); - htmlContent.append("<p>" + zoneName + " - " + speciesName + "</p>"); - htmlContent.append("<img src='file://" + file.getAbsolutePath() + "' />"); - htmlContent.append("</div>"); + try { + StringBuilder htmlContent = new StringBuilder(); + htmlContent.append("<html><head>"); + htmlContent.append("<title>" + l_(locale, "coser.business.extract.extracttitle")+ "</title>"); + htmlContent.append("<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />"); + htmlContent.append("</head><body>"); + + if (pdfMaps != null) { + for (Entry<MultiKey, File> mapEntry : (Set<Entry<MultiKey, File>>)pdfMaps.entrySet()) { + String zoneId = (String)mapEntry.getKey().getKey(0); + if (zoneId.equals(zone)) { + String speciesName = (String)mapEntry.getKey().getKey(1); + File file = mapEntry.getValue(); + + String zoneName = getZoneFullName(zoneId); + htmlContent.append("<div style='page-break-after: always'>"); + htmlContent.append("<p>" + zoneName + " - " + speciesName + "</p>"); + htmlContent.append("<img src='file://" + file.getAbsolutePath() + "' />"); + htmlContent.append("</div>"); + } + } } - } - - if (pdfCharts != null) { - for (Entry<String, Object[]> chartFileAndData : pdfCharts.entrySet()) { - //String key = chartFileAndData.getKey(); - File chartFile = (File)chartFileAndData.getValue()[0]; - String content = (String)chartFileAndData.getValue()[1]; - - htmlContent.append("<div style='page-break-after: always'>"); - htmlContent.append("<img src='file://" + chartFile.getAbsolutePath() + "' />"); - htmlContent.append("<br />"); - htmlContent.append(l_(locale, "coser.business.extract.extractdata") + " :"); - htmlContent.append("<pre>").append(content).append("</pre>"); - htmlContent.append("</div>"); - - // les graphiques ont été générés, a supprimer donc - // a ne surtout pas faire avec les cartes !!! - toDelete.add(chartFile); - } - } - htmlContent.append("</body></html>"); - - // get content as w3c document - Document document = CoserUtils.parseDocument(htmlContent.toString()); - - // render template output as pdf - os = new FileOutputStream(pdfFile); - - ITextRenderer renderer = new ITextRenderer(); - /* plus rapide, mais ne fonctionne pas, les images n'apparaissent pas - renderer.getSharedContext().setUserAgentCallback(new ITextUserAgent(renderer.getOutputDevice()) { - @Override - protected InputStream resolveAndOpenStream(String uri) { - String localuri = StringUtils.removeStart(uri, "file://"); - Object[] chartData = chartFileAndDatas.get(localuri); - InputStream is; - if (chartData != null) { - byte[] os = (byte[])chartData[0]; - is = new ByteArrayInputStream(os); - } else { - is = super.resolveAndOpenStream(uri); + if (pdfCharts != null) { + for (Entry<MultiKey, Object[]> chartFileAndData : (Set<Entry<MultiKey, Object[]>>)pdfCharts.entrySet()) { + String zoneId = (String)chartFileAndData.getKey().getKey(0); + if (zoneId.equals(zone)) { + File chartFile = (File)chartFileAndData.getValue()[0]; + String content = (String)chartFileAndData.getValue()[1]; + + htmlContent.append("<div style='page-break-after: always'>"); + htmlContent.append("<img src='file://" + chartFile.getAbsolutePath() + "' />"); + htmlContent.append("<br />"); + htmlContent.append(l_(locale, "coser.business.extract.extractdata") + " :"); + htmlContent.append("<pre>").append(content).append("</pre>"); + htmlContent.append("</div>"); + + // les graphiques ont été générés, a supprimer donc + // a ne surtout pas faire avec les cartes !!! + toDelete.add(chartFile); + } } - return is; } - });*/ - renderer.setDocument(document, null); - renderer.layout(); - renderer.createPDF(os); + + htmlContent.append("</body></html>"); + + // get content as w3c document + Document document = CoserUtils.parseDocument(htmlContent.toString()); + + // render template output as pdf + String zoneDisplay = getZoneFullName(zone); + File pdfFile = new File(directory, zoneDisplay + ".pdf"); + os = new FileOutputStream(pdfFile); + + ITextRenderer renderer = new ITextRenderer(); + renderer.setDocument(document, null); + renderer.layout(); + renderer.createPDF(os); + + os.close(); + } catch (IOException ex) { + throw new CoserBusinessException("Can't generate log pdf", ex); + } catch (DocumentException ex) { + throw new CoserBusinessException("Can't generate log pdf", ex); + } finally { + IOUtils.closeQuietly(os); - os.close(); - } catch (IOException ex) { - throw new CoserBusinessException("Can't generate log pdf", ex); - } catch (DocumentException ex) { - throw new CoserBusinessException("Can't generate log pdf", ex); - } finally { - IOUtils.closeQuietly(os); - - // delete file collection - for (File file : toDelete) { - file.delete(); + // delete file collection + for (File file : toDelete) { + file.delete(); + } } } - } }

1 0

r1101 - in trunk/coser-web/src/main: resources/fr/ifremer/coser/web webapp/WEB-INF/content
by echatellier＠users.forge.codelutin.com Jan. 29, 2013

Jan. 29, 2013

Author: echatellier Date: 2013-01-29 12:01:20 +0100 (Tue, 29 Jan 2013) New Revision: 1101 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1101 Log: fixes #1938: Ajout d'un nouveau lien Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2013-01-23 20:41:15 UTC (rev 1100) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2013-01-29 11:01:20 UTC (rev 1101) @@ -186,6 +186,7 @@ message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.estcorse.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.estcorse.plus=For more information on the Medits surveys message.survey.mediterranee.estcorse=East Corsica message.survey.mediterranee.golfelion.desc=French contribution to the internationally coordinated Medits (International bottom Trawl Surveys in the Mediterranean) survey, lasting one month in the second quarter every year since 1994 using a GOV bottom trawl with short wings. On average 69 hauls are carried out; haul duration is half an hour above 200 m depth which corresponds to 0.05 km\u00B2 and one hour for bottom depths greater than 200 m (0.1\u00A0km\u00B2). Medits provides a representative picture of the 13 860 km\u00B2 of the gulf of Lions. @@ -194,6 +195,7 @@ message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.golfelion.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.golfelion.plus=For more information on the Medits surveys message.survey.mediterranee.golfelion=Gulf of Lions message.survey.mediterranee=Mediterranean Sea Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2013-01-23 20:41:15 UTC (rev 1100) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2013-01-29 11:01:20 UTC (rev 1101) @@ -186,6 +186,7 @@ message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.estcorse.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.estcorse.plus=For more information on the Medits surveys message.survey.mediterranee.estcorse=East Corsica message.survey.mediterranee.golfelion.desc=French contribution to the internationally coordinated Medits (International bottom Trawl Surveys in the Mediterranean) survey, lasting one month in the second quarter every year since 1994 using a GOV bottom trawl with short wings. On average 69 hauls are carried out; haul duration is half an hour above 200 m depth which corresponds to 0.05 km\u00B2 and one hour for bottom depths greater than 200 m (0.1\u00A0km\u00B2). Medits provides a representative picture of the 13 860 km\u00B2 of the gulf of Lions. @@ -194,6 +195,7 @@ message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.golfelion.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.golfelion.plus=For more information on the Medits surveys message.survey.mediterranee.golfelion=Gulf of Lions message.survey.mediterranee=Mediterranean Sea Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties 2013-01-23 20:41:15 UTC (rev 1100) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_es.properties 2013-01-29 11:01:20 UTC (rev 1101) @@ -187,6 +187,7 @@ message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.estcorse.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.estcorse.plus=Pour en savoir plus sur les campagnes Medits message.survey.mediterranee.estcorse=Est de la Corse message.survey.mediterranee.golfelion.desc=Contribution fran�aise aux campagnes internationales Medits (International bottom Trawl Surveys in the Mediterranean), d''un mois au deuxi�me trimestre tous les ans depuis 1994 au chalut de fond � grande ouverture verticale � ailes courtes. En moyenne 69 chalutages sont r�alis�s, d''une demi-heure couvrant une surface d''environ 0,05 km\u00B2 chacun pour les profondeurs inf�rieures � 200 m�tres et d''une heure (surface d''environ 0,1\u00A0km\u00B2) pour les profondeurs sup�rieures � 200 m�tres. Medits est repr�sentative des 13 860 km\u00B2 du golfe de Lion. @@ -195,6 +196,7 @@ message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.golfelion.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.golfelion.plus=Pour en savoir plus sur les campagnes Medits message.survey.mediterranee.golfelion=Golfe du Lion message.survey.mediterranee=Fa�ade M�diterran�e Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2013-01-23 20:41:15 UTC (rev 1100) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2013-01-29 11:01:20 UTC (rev 1101) @@ -186,6 +186,7 @@ message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.estcorse.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.estcorse.plus=Pour en savoir plus sur les campagnes Medits message.survey.mediterranee.estcorse=Est de la Corse message.survey.mediterranee.golfelion.desc=Contribution fran�aise aux campagnes internationales Medits (International bottom Trawl Surveys in the Mediterranean), d''un mois au deuxi�me trimestre tous les ans depuis 1994 au chalut de fond � grande ouverture verticale � ailes courtes. En moyenne 69 chalutages sont r�alis�s, d''une demi-heure couvrant une surface d''environ 0,05 km\u00B2 chacun pour les profondeurs inf�rieures � 200 m�tres et d''une heure (surface d''environ 0,1\u00A0km\u00B2) pour les profondeurs sup�rieures � 200 m�tres. Medits est repr�sentative des 13 860 km\u00B2 du golfe de Lion. @@ -194,6 +195,7 @@ message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.golfelion.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.golfelion.plus=Pour en savoir plus sur les campagnes Medits message.survey.mediterranee.golfelion=Golfe du Lion message.survey.mediterranee=Fa�ade M�diterran�e Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2013-01-23 20:41:15 UTC (rev 1100) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/survey.jsp 2013-01-29 11:01:20 UTC (rev 1101) @@ -26,7 +26,7 @@ <%@taglib uri="/struts-tags" prefix="s" %> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title><s:text name="message.quality.title" /></title> + <title><s:text name="message.survey.maintitle" /></title> <script type="text/javascript" src="<s:url value='/js/jquery.expander.min.js' />"></script> <script type="text/javascript"> $(document).ready(function() { @@ -234,6 +234,7 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits5" /></a></li> + <li><a href="https://w3.ifremer.fr/archimer/doc/00117/22783/ " target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits6" /></a></li> </ul> </p> @@ -250,6 +251,7 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits5" /></a></li> + <li><a href="https://w3.ifremer.fr/archimer/doc/00117/22783/ " target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits6" /></a></li> </ul> </p> </body>

1 0

r1100 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Jan. 23, 2013

Jan. 23, 2013

Author: echatellier Date: 2013-01-23 21:41:15 +0100 (Wed, 23 Jan 2013) New Revision: 1100 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1100 Log: fixes #1727: Update to struts 2.3.8 fixes #1929: Update to HttpComponents 4.2.3 fixes #1930: Update to junit 4.11 fixes #1931: Update to nuiton-utils 2.6.6 fixes #1932: Update to jaxx 2.5.9 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/pom.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-12-29 14:45:19 UTC (rev 1099) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2013-01-23 20:41:15 UTC (rev 1100) @@ -48,6 +48,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.FileManager; +import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; @@ -117,8 +118,8 @@ Container container = conf.getContainer(); // huge improve cache performance - FileManager fileManager = container.getInstance(FileManager.class); - fileManager.setReloadingConfigs(false); + FileManagerFactory fileManagerFactory = container.getInstance(FileManagerFactory.class); + fileManagerFactory.setReloadingConfigs("false"); ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); ValueStack vs = stackFactory.createValueStack(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 14:45:19 UTC (rev 1099) +++ trunk/pom.xml 2013-01-23 20:41:15 UTC (rev 1100) @@ -33,7 +33,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> + <version>4.11</version> <scope>test</scope> </dependency> @@ -96,35 +96,35 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.6.4</version> + <version>2.6.6</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>2.6.4</version> + <version>2.6.6</version> <scope>compile</scope> </dependency> @@ -347,9 +347,9 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName>  - <jaxx.version>2.5.6</jaxx.version> + <jaxx.version>2.5.9</jaxx.version> <i18n.version>2.5</i18n.version> - <struts.version>2.3.4.1</struts.version> + <struts.version>2.3.8</struts.version> </properties> <scm> @@ -377,7 +377,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>8.1.7.v20120910</version> + <version>8.1.8.v20121106</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0