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

r653 - tags
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 11:07:11 +0000 (Wed, 02 Feb 2011) New Revision: 653 Log: [maven-release-plugin] copy for tag coser-1.0.0-beta3 Added: tags/coser-1.0.0-beta3/

1 0

r652 - in trunk: . coser-business coser-ui coser-web
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 11:07:07 +0000 (Wed, 02 Feb 2011) New Revision: 652 Log: [maven-release-plugin] prepare release coser-1.0.0-beta3 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-02-02 11:03:02 UTC (rev 651) +++ trunk/coser-business/pom.xml 2011-02-02 11:07:07 UTC (rev 652) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta3-SNAPSHOT</version> + <version>1.0.0-beta3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-02-02 11:03:02 UTC (rev 651) +++ trunk/coser-ui/pom.xml 2011-02-02 11:07:07 UTC (rev 652) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta3-SNAPSHOT</version> + <version>1.0.0-beta3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-02-02 11:03:02 UTC (rev 651) +++ trunk/coser-web/pom.xml 2011-02-02 11:07:07 UTC (rev 652) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta3-SNAPSHOT</version> + <version>1.0.0-beta3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-02 11:03:02 UTC (rev 651) +++ trunk/pom.xml 2011-02-02 11:07:07 UTC (rev 652) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta3-SNAPSHOT</version> + <version>1.0.0-beta3</version> <packaging>pom</packaging> <modules> @@ -319,9 +319,9 @@ </properties> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.0-beta3</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.0-beta3</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/coser-1.0.0-beta3?root…</url> </scm> <build>

1 0

r651 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 11:03:02 +0000 (Wed, 02 Feb 2011) New Revision: 651 Log: Use escape xml instead of escape html 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 2011-02-02 10:43:56 UTC (rev 650) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-02 11:03:02 UTC (rev 651) @@ -2092,7 +2092,7 @@ String speciesName = projectService.getSpeciesDisplayName(project, speciesCode); // fix html entities bug - speciesName = StringEscapeUtils.escapeHtml(speciesName); + speciesName = StringEscapeUtils.escapeXml(speciesName); // recupere le code type de l'espece, "m", "c", "p" ... Integer speciesNumSys = refTaxSpecies.get(speciesCode);

1 0

r650 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 10:43:56 +0000 (Wed, 02 Feb 2011) New Revision: 650 Log: Fix jscrollpane (temporary) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-02-02 10:39:31 UTC (rev 649) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-02-02 10:43:56 UTC (rev 650) @@ -39,9 +39,10 @@ import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; import javax.swing.filechooser.FileFilter; -import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; @@ -256,7 +257,14 @@ aboutPanel.init(); aboutPanel.showInDialog(view, true);*/ - AboutFrame aboutFrame = new AboutFrame(); + AboutFrame aboutFrame = new AboutFrame() { + @Override + protected Component getLicenseTab() { + JTextArea textArea = (JTextArea)super.getLicenseTab(); + textArea.setCaretPosition(0); + return new JScrollPane(textArea); + } + }; aboutFrame.setTitle(_("coser.ui.about.title")); aboutFrame.setAboutHtmlText(_("coser.ui.about.about", config.getApplicationVersion())); aboutFrame.setIconPath("/icons/logo300.png");

1 0

r649 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 10:39:31 +0000 (Wed, 02 Feb 2011) New Revision: 649 Log: Fix javadoc Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 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 2011-02-02 10:31:30 UTC (rev 648) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-02-02 10:39:31 UTC (rev 649) @@ -132,7 +132,7 @@ * * @param bean bean to validate * @param category result errors category - * @return + * @return error list */ protected List<ControlError> validate(AbstractDataEntity bean, Category category) { List<ControlError> result = new ArrayList<ControlError>(); @@ -437,7 +437,7 @@ * @param control control * @param category category * @param progress progress monitor - * @return + * @return error list for category (can be {@code null}) */ protected List<ControlError> validateCategorySpecific(Control control, Category category, ProgressMonitor progress) { @@ -464,9 +464,9 @@ * Alerte si Somme(CAPTURES$Nombre par CAPTURES$Annee|Strate|Espece) < nobsmin. * Erreur si CAPT$Nombre n'est pas 0 si le poids dans CAPT$Poids>0 * - * @param control - * @param progress - * @return + * @param control control + * @param progress progress monitor + * @return error list */ protected List<ControlError> validateCategorySpecificCatch( Control control, ProgressMonitor progress) { @@ -734,9 +734,9 @@ /** * Alerte si Somme(TAILLES$Nombre par TAILLES$Annee|Strate|Espece) < nobsmin * - * @param control - * @param progress - * @return + * @param control control + * @param progress progress + * @return error list */ protected List<ControlError> validateCategorySpecificLength( Control control, ProgressMonitor progress) { @@ -824,9 +824,11 @@ } /** - * @param control - * @param progress - * @return + * Specific validation for Haul category. + * + * @param control control + * @param progress progress + * @return {@code null} */ protected List<ControlError> validateCategorySpecificHaul(Control control, ProgressMonitor progress) { @@ -834,9 +836,11 @@ } /** - * @param control - * @param progress - * @return + * Specific validation for Strata category. + * + * @param control control + * @param progress progress + * @return {@code null} */ protected List<ControlError> validateCategorySpecificStrata( Control control, ProgressMonitor progress) {

1 0

r648 - trunk
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 10:31:30 +0000 (Wed, 02 Feb 2011) New Revision: 648 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-02 10:28:10 UTC (rev 647) +++ trunk/changelog.txt 2011-02-02 10:31:30 UTC (rev 648) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * Add sample breadcrumb * Add images legend for in distibution map last page * Name extracted result archive as Coserextract<dateofday> * Add coser logo and website favicon

1 0

r647 - in trunk/coser-web/src/main: resources/fr/ifremer/coser/web webapp/WEB-INF/content/map webapp/styles
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 10:28:10 +0000 (Wed, 02 Feb 2011) New Revision: 647 Log: Add sample breadscrum Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp trunk/coser-web/src/main/webapp/styles/coser.css 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 2011-02-02 10:13:47 UTC (rev 646) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-02-02 10:28:10 UTC (rev 647) @@ -55,6 +55,7 @@ message.common.selectspecies=Select a species message.common.jsreadmore=Read more message.common.validform=Valid +message.common.facade=Facade message.map.citationtitle=Citation message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p. message.map.downloadaspdf=Download as PDF 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 2011-02-02 10:13:47 UTC (rev 646) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2011-02-02 10:28:10 UTC (rev 647) @@ -55,6 +55,7 @@ message.common.noresults=Aucun r\u00E9sultat disponible message.common.jsreadmore=Voir la suite message.common.validform=Valider +message.common.facade=Facade message.map.citationtitle=Citation message.map.citation=Trenkel V.M., O. Berthel\u00E9, P. Lorance, J.A. Bertrand, A. Brind''Amour, M.L. Cochard, F. Coppin, J.P. Leaut\u00E9, J.C. Mah\u00E9, J. Morin, M.J. Rochet, M. Salaun, A. Souplet & Y. V\u00E9rin, 2009. Grands invert\u00E9br\u00E9s et poissons observ\u00E9s par les campagnes scientifiques. Atlas de distribution. Bilan 2008. Ifremer, Nantes. EMH : 09-003. {0}. 100 p. message.map.downloadaspdf=T\u00E9l\u00E9charger en PDF Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-02-02 10:13:47 UTC (rev 646) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/facade.jsp 2011-02-02 10:28:10 UTC (rev 647) @@ -30,6 +30,12 @@ </head> <body> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a></li> + </ul> + </div> + <h2><s:text name="message.map.title" /></h2> <img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-02-02 10:13:47 UTC (rev 646) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-02-02 10:28:10 UTC (rev 647) @@ -30,6 +30,33 @@ </head> <body> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="survey" namespace='/map'> + <s:param name="facade" value="facade" /> + <s:property value='facade' /> + </s:a> > + </li> + <li> + <s:a action="species" namespace='/map'> + <s:param name="facade" value="facade" /> + <s:param name="survey" value="survey" /> + <s:property value='survey' /> + </s:a> > + </li> + <li> + <s:a action="map" namespace='/map'> + <s:param name="facade" value="facade" /> + <s:param name="survey" value="survey" /> + <s:param name="species" value="species" /> + <s:property value='species' /> + </s:a> + </li> + </ul> + </div> + <h2><s:text name="message.map.title" /></h2> <h3><s:property value='facadeDisplayName' /> - <s:property value='survey' /> - <s:property value='speciesDisplayName' /></h3> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-02-02 10:13:47 UTC (rev 646) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-02-02 10:28:10 UTC (rev 647) @@ -30,6 +30,25 @@ </head> <body> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="survey" namespace='/map'> + <s:param name="facade" value="facade" /> + <s:property value='facade' /> + </s:a> > + </li> + <li> + <s:a action="species" namespace='/map'> + <s:param name="facade" value="facade" /> + <s:param name="survey" value="survey" /> + <s:property value='survey' /> + </s:a> + </li> + </ul> + </div> + <h2><s:text name="message.map.title" /></h2> <img src="<s:url action='map-data'> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-02-02 10:13:47 UTC (rev 646) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-02-02 10:28:10 UTC (rev 647) @@ -30,6 +30,18 @@ </head> <body> + <div class="breadcrumb"> + <ul> + <li><s:a action="facade" namespace='/map'><s:text name="message.common.facade" /></s:a> ></li> + <li> + <s:a action="survey" namespace='/map'> + <s:param name="facade" value="facade"/> + <s:property value='facade' /> + </s:a> + </li> + </ul> + </div> + <h2><s:text name="message.map.title" /></h2> <img src="<s:url value='/images/facadesmap.png' />" style="float:right;margin-left:10px;width:318px; heigth:318px;" /> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-02-02 10:13:47 UTC (rev 646) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-02-02 10:28:10 UTC (rev 647) @@ -697,3 +697,12 @@ .errorMessage { color:red; } + +.breadcrumb a { + color: #6E6E6E; + font-size: 80%; + line-height: 1em; +} +.breadcrumb ul li { + display:inline; +} \ No newline at end of file

1 0

r646 - trunk/coser-web/src/main/webapp/WEB-INF/decorators
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 10:13:47 +0000 (Wed, 02 Feb 2011) New Revision: 646 Log: Fix target blank Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 10:12:32 UTC (rev 645) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 10:13:47 UTC (rev 646) @@ -76,8 +76,8 @@ <div> <h3><s:text name="message.layout.oceanicdatatitle" /></h3> <ul> - <li><a href="http://www.ifremer.fr/sismer/index_FR.htm" class="lien"><s:text name="message.layout.oceanicdata1" /></a></li> - <li><a href="http://www.ifremer.fr/sih/" class="lien"><s:text name="message.layout.oceanicdata2" /></a></li> + <li><a href="http://www.ifremer.fr/sismer/index_FR.htm" class="lien" target="_blank"><s:text name="message.layout.oceanicdata1" /></a></li> + <li><a href="http://www.ifremer.fr/sih/" class="lien" target="_blank"><s:text name="message.layout.oceanicdata2" /></a></li> </ul> </div> </div>

1 0

r645 - trunk/coser-web/src/main/webapp/WEB-INF/decorators
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 10:12:32 +0000 (Wed, 02 Feb 2011) New Revision: 645 Log: Fix species Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-02-02 10:06:26 UTC (rev 644) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-02-02 10:12:32 UTC (rev 645) @@ -56,10 +56,10 @@ <div class="top_content"> <a href="<s:url action='index' namespace='/' />" class="accueil"><s:text name="message.index.title" /></a> <a href="<s:url namespace="/" action="locale"> - <s:param name="request_locale" >en</s:param> + <s:param name="request_locale">en</s:param> </s:url>" class="anglais">Anglais</a> <a href="<s:url namespace="/" action="locale"> - <s:param name="request_locale" >fr</s:param> + <s:param name="request_locale">fr</s:param> </s:url>" class="francais">Francais</a> </div> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 10:06:26 UTC (rev 644) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 10:12:32 UTC (rev 645) @@ -52,10 +52,10 @@ <div class="top_content clearfix"> <a href="<s:url action='index' namespace='/' />" class="accueil"><s:text name="message.index.title" /></a> <a href="<s:url namespace="/" action="locale"> - <s:param name="request_locale" >en</s:param> + <s:param name="request_locale">en</s:param> </s:url>" class="anglais">Anglais</a> <a href="<s:url namespace="/" action="locale"> - <s:param name="request_locale" >fr</s:param> + <s:param name="request_locale">fr</s:param> </s:url>" class="francais">Francais</a> </div>

1 0

r644 - in trunk: . coser-web/src/main/webapp/WEB-INF/content/map
by chatellier＠users.labs.libre-entreprise.org Feb. 2, 2011

Feb. 2, 2011

Author: chatellier Date: 2011-02-02 10:06:26 +0000 (Wed, 02 Feb 2011) New Revision: 644 Log: Add images legend for in distibution map last page Modified: trunk/changelog.txt trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-02 10:06:18 UTC (rev 643) +++ trunk/changelog.txt 2011-02-02 10:06:26 UTC (rev 644) @@ -4,6 +4,9 @@ 1.0.0-beta3 ----------- + * Add images legend for in distibution map last page + * Name extracted result archive as Coserextract<dateofday> + * Add coser logo and website favicon * Improve quality advertisement checkbox with form submit * Add top anchor on survey description page * Fix pdf generation containing non escaped html entities Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-02-02 10:06:18 UTC (rev 643) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-02-02 10:06:26 UTC (rev 644) @@ -32,8 +32,10 @@ <h2><s:text name="message.map.title" /></h2> - <p><s:property value='facade' /> - <s:property value='survey' /> - <s:property value='speciesDisplayName' /></p> + <h3><s:property value='facadeDisplayName' /> - <s:property value='survey' /> - <s:property value='speciesDisplayName' /></h3> + <p><s:text name="message.map.paragraph2" /></p> + <img src="<s:url action='map-data'> <s:param name="survey" value="%{survey}" /> <s:param name="species" value="%{species}" />

1 0