r2605 - in trunk: . src src/license src/main/java/org/nuiton/csv src/site
Author: tchemit Date: 2014-02-04 11:32:22 +0100 (Tue, 04 Feb 2014) New Revision: 2605 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2605 Log: fixes #3049: updates mavenpom to 4.7 fixes #3050: updates I18n to 3.0 fixes #3051: updates nuiton-utils to 3.0-rc-2 Added: trunk/src/license/ trunk/src/license/THIRD-PARTY.properties Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/main/java/org/nuiton/csv/Import.java trunk/src/main/java/org/nuiton/csv/Import2.java trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-12-12 10:52:37 UTC (rev 2604) +++ trunk/LICENSE.txt 2014-02-04 10:32:22 UTC (rev 2605) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:52:37 UTC (rev 2604) +++ trunk/pom.xml 2014-02-04 10:32:22 UTC (rev 2605) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.4</version> + <version>4.7</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -13,7 +13,7 @@ <name>Nuiton CSV</name> <description>Simple CSV API</description> - <url>http://maven-site.nuiton.org/nuiton-csv</url> + <url>https://maven-site.nuiton.org/nuiton-csv</url> <inceptionYear>2013</inceptionYear> <developers> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk + scm:svn:https://nuiton.org/svn/nuiton-csv/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk + scm:svn:https://nuiton.org/svn/nuiton-csv/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-csv/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-csv/repository/show/trunk</url> </scm> <distributionManagement> <site> @@ -64,8 +64,8 @@ <projectId>nuiton-csv</projectId> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> + <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> Added: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/src/license/THIRD-PARTY.properties 2014-02-04 10:32:22 UTC (rev 2605) @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - GNU Library or Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Feb 04 11:24:22 CET 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Property changes on: trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/src/main/java/org/nuiton/csv/Import.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Import.java 2013-12-12 10:52:37 UTC (rev 2604) +++ trunk/src/main/java/org/nuiton/csv/Import.java 2014-02-04 10:32:22 UTC (rev 2605) @@ -43,7 +43,7 @@ import java.util.NoSuchElementException; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Import engine for a given import model. @@ -220,7 +220,7 @@ } catch (Exception e) { reader.close(); throw new ImportRuntimeException( - _("csv.import.error.unableToReadField", + t("csv.import.error.unableToReadField", field.getHeaderName(), lineNumber), e); } } @@ -232,7 +232,7 @@ T parsedValue = field.parseValue(value); return parsedValue; } catch (Exception e) { - String message = _("csv.import.error.unableToParseValue", + String message = t("csv.import.error.unableToParseValue", value, field.getHeaderName(), lineNumber) + "\n" + e.getMessage(); throw new ImportRuntimeException(message, e); @@ -246,7 +246,7 @@ try { field.setValue(element, parsedValue); } catch (Exception e) { - String message = _("csv.import.error.unableToSetValue", + String message = t("csv.import.error.unableToSetValue", parsedValue, element.toString(), lineNumber, field.getHeaderName()); @@ -271,7 +271,7 @@ validHeaderNames.add(importableColumn.getHeaderName()); } String validationMessage = - _("csv.import.error.unrecognizedHeaders", + t("csv.import.error.unrecognizedHeaders", StringUtil.join(csvHeaders, ", ", true), StringUtil.join(validHeaderNames, ", ", true)); throw new ImportRuntimeException(validationMessage); @@ -290,7 +290,7 @@ } } if (!doubleHeaderNames.isEmpty()) { - String message = _("csv.import.error.duplicatedHeaders", + String message = t("csv.import.error.duplicatedHeaders", StringUtil.join(doubleHeaderNames, ", ", true)); throw new ImportRuntimeException( @@ -311,7 +311,7 @@ if (!mandatoryHeadersNames.isEmpty()) { String validationMessage = - _("csv.import.error.missingMandatoryHeaders", + t("csv.import.error.missingMandatoryHeaders", StringUtil.join(mandatoryHeadersNames, ", ", true)); throw new ImportRuntimeException(validationMessage); } @@ -322,11 +322,11 @@ boolean canReadHeaders = reader.readHeaders(); if (!canReadHeaders) { throw new ImportRuntimeException( - _("csv.import.error.unableToReadHeaders")); + t("csv.import.error.unableToReadHeaders")); } } catch (IOException e) { throw new ImportRuntimeException( - _("csv.import.error.unableToReadHeaders"), e); + t("csv.import.error.unableToReadHeaders"), e); } try { @@ -334,7 +334,7 @@ return result; } catch (IOException e) { throw new ImportRuntimeException( - _("csv.import.error.unableToReadHeaders"), e); + t("csv.import.error.unableToReadHeaders"), e); } } @@ -402,7 +402,7 @@ return hasNext; } catch (IOException e) { reader.close(); - throw new ImportRuntimeException(_("csv.import.error.unableToReadLine", 1), e); + throw new ImportRuntimeException(t("csv.import.error.unableToReadLine", 1), e); } } Modified: trunk/src/main/java/org/nuiton/csv/Import2.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Import2.java 2013-12-12 10:52:37 UTC (rev 2604) +++ trunk/src/main/java/org/nuiton/csv/Import2.java 2014-02-04 10:32:22 UTC (rev 2605) @@ -44,7 +44,7 @@ import java.util.NoSuchElementException; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Improve the first {@link Import} class with the notion of {@link ImportRow}. @@ -174,7 +174,7 @@ T parsedValue = field.parseValue(value); return parsedValue; } catch (Exception e) { - String message = _("csv.import.error.unableToParseValue", + String message = t("csv.import.error.unableToParseValue", value, field.getHeaderName(), lineNumber) + "\n" + e.getMessage(); throw new ImportRuntimeException(message, e); @@ -188,7 +188,7 @@ try { field.setValue(element, parsedValue); } catch (Exception e) { - String message = _("csv.import.error.unableToSetValue", + String message = t("csv.import.error.unableToSetValue", parsedValue, element.toString(), lineNumber, field.getHeaderName()); @@ -213,7 +213,7 @@ validHeaderNames.add(importableColumn.getHeaderName()); } String validationMessage = - _("csv.import.error.unrecognizedHeaders", + t("csv.import.error.unrecognizedHeaders", StringUtil.join(csvHeaders, ", ", true), StringUtil.join(validHeaderNames, ", ", true)); throw new ImportRuntimeException(validationMessage); @@ -232,7 +232,7 @@ } } if (!doubleHeaderNames.isEmpty()) { - String message = _("csv.import.error.duplicatedHeaders", + String message = t("csv.import.error.duplicatedHeaders", StringUtil.join(doubleHeaderNames, ", ", true)); throw new ImportRuntimeException( @@ -253,7 +253,7 @@ if (!mandatoryHeadersNames.isEmpty()) { String validationMessage = - _("csv.import.error.missingMandatoryHeaders", + t("csv.import.error.missingMandatoryHeaders", StringUtil.join(mandatoryHeadersNames, ", ", true)); throw new ImportRuntimeException(validationMessage); } @@ -264,11 +264,11 @@ boolean canReadHeaders = reader.readHeaders(); if (!canReadHeaders) { throw new ImportRuntimeException( - _("csv.import.error.unableToReadHeaders")); + t("csv.import.error.unableToReadHeaders")); } } catch (IOException e) { throw new ImportRuntimeException( - _("csv.import.error.unableToReadHeaders"), e); + t("csv.import.error.unableToReadHeaders"), e); } try { @@ -276,7 +276,7 @@ return result; } catch (IOException e) { throw new ImportRuntimeException( - _("csv.import.error.unableToReadHeaders"), e); + t("csv.import.error.unableToReadHeaders"), e); } } @@ -338,7 +338,7 @@ return hasNext; } catch (IOException e) { reader.close(); - throw new ImportRuntimeException(_("csv.import.error.unableToReadLine", 1), e); + throw new ImportRuntimeException(t("csv.import.error.unableToReadLine", 1), e); } } @@ -392,7 +392,7 @@ if (strictMode) { // throw an error throw new ImportRuntimeException( - _("csv.import.error.unableToReadField", + t("csv.import.error.unableToReadField", field.getHeaderName(), lineNumber), e); } else { row.addError(new ImportReadErrorInfo<E>( @@ -407,7 +407,7 @@ parsedValue = parseValue(field, lineNumber, value); } catch (Exception e) { if (strictMode) { - String message = _("csv.import.error.unableToParseValue", + String message = t("csv.import.error.unableToParseValue", value, field.getHeaderName(), lineNumber) + "\n" + e.getMessage(); throw new ImportRuntimeException(message, e); @@ -423,7 +423,7 @@ setValue(field, lineNumber, element, parsedValue); } catch (Exception e) { if (strictMode) { - String message = _("csv.import.error.unableToSetValue", + String message = t("csv.import.error.unableToSetValue", parsedValue, element.toString(), lineNumber, field.getHeaderName()); Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-12-12 10:52:37 UTC (rev 2604) +++ trunk/src/site/site_fr.xml 2014-02-04 10:32:22 UTC (rev 2605) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -58,7 +58,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> </poweredBy> @@ -66,11 +66,11 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <links> @@ -93,7 +93,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' @@ -102,7 +102,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' locale='fr'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body>
participants (1)
-
tchemit＠users.nuiton.org