Author: tchemit Date: 2014-02-04 06:48:46 +0100 (Tue, 04 Feb 2014) New Revision: 2607 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2607 Log: fixes #3028: updates mavenpom to 4.6 fixes #2940: Update to commons-collections4 fixes #3027: Updates xwork-core to 2.3.16 refs #3029: Updates i18n to 3.0 Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/main/java/org/nuiton/validator/NuitonValidatorResult.java trunk/src/main/java/org/nuiton/validator/NuitonValidatorScope.java trunk/src/main/java/org/nuiton/validator/bean/AbstractValidator.java trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidator.java trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidatorMessage.java trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidatorMessage.java trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/LICENSE.txt 2014-02-04 05:48:46 UTC (rev 2607) @@ -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-10-28 13:35:15 UTC (rev 2606) +++ trunk/pom.xml 2014-02-04 05:48:46 UTC (rev 2607) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.6</version> </parent> <artifactId>nuiton-validator</artifactId> @@ -34,12 +34,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-validator/trunk + scm:svn:https://nuiton.org/svn/nuiton-validator/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-validator/trunk + scm:svn:https://nuiton.org/svn/nuiton-validator/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-validator/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-validator/repository/show/trunk</url> </scm> <distributionManagement> <site> @@ -52,7 +52,7 @@ <projectId>nuiton-validator</projectId> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonI18nVersion>3.0-SNAPSHOT</nuitonI18nVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -72,7 +72,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.6.12</version> + <version>3.0-rc-1</version> </dependency> <dependency> @@ -84,7 +84,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>2.3.15.1</version> + <version>2.3.16</version> <exclusions> <exclusion> <groupId>asm</groupId> @@ -113,8 +113,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> Modified: trunk/src/main/java/org/nuiton/validator/NuitonValidatorResult.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/NuitonValidatorResult.java 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/validator/NuitonValidatorResult.java 2014-02-04 05:48:46 UTC (rev 2607) @@ -23,7 +23,7 @@ */ package org.nuiton.validator; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import java.util.ArrayList; import java.util.Collections; Modified: trunk/src/main/java/org/nuiton/validator/NuitonValidatorScope.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/NuitonValidatorScope.java 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/validator/NuitonValidatorScope.java 2014-02-04 05:48:46 UTC (rev 2607) @@ -23,7 +23,7 @@ */ package org.nuiton.validator; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * The differents levels of messages in validation process. @@ -43,28 +43,28 @@ * When a message of a such scope is found on a validator, then the * validator is invalid and modified. */ - FATAL(n_("validator.scope.fatal.label")), + FATAL(n("validator.scope.fatal.label")), /** * the error scope level. * <p/> * When a message of a such scope is found on a validator, then the * validator is invalid and modified. */ - ERROR(n_("validator.scope.error.label")), + ERROR(n("validator.scope.error.label")), /** * the warning scope level. * <p/> * When a message of a such scope is found on a validator, then the * validator is still valid but modified. */ - WARNING(n_("validator.scope.warning.label")), + WARNING(n("validator.scope.warning.label")), /** * the information scope level. * <p/> * When a message of a sucg scope is found on a validator, then the * validator is still valid and not modified. */ - INFO(n_("validator.scope.info.label")); + INFO(n("validator.scope.info.label")); private final String label; Modified: trunk/src/main/java/org/nuiton/validator/bean/AbstractValidator.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/bean/AbstractValidator.java 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/validator/bean/AbstractValidator.java 2014-02-04 05:48:46 UTC (rev 2607) @@ -80,16 +80,6 @@ */ public static final String CHANGED_PROPERTY = "changed"; -// /** Logger. */ -// private static final Log log = LogFactory.getLog(BeanValidator.class); - -// /** -// * The delegate validator used to validate the bean. -// * -// * @since 2.5.2 -// */ -// protected NuitonValidator<O> delegate; - /** * State to indicate that validator has changed since the last time bean was * setted. @@ -141,25 +131,6 @@ pcs = new PropertyChangeSupport(this); -// // build delegate validator -// rebuildDelegateValidator( -// beanClass, -// context, -// scopes -// ); - -// // context has changed -// firePropertyChange(CONTEXT_PROPERTY, -// null, -// context -// ); -// -// // scopes has changed -// firePropertyChange(SCOPES_PROPERTY, -// null, -// scopes -// ); - l = new PropertyChangeListener() { @Override @@ -360,31 +331,4 @@ protected NuitonValidatorModel<O> getModel() { return getDelegate().getModel(); } - -// protected NuitonValidator<O> rebuildDelegateValidator(Class<O> beanType, -// String context, -// NuitonValidatorScope... scopes) { -// -// // changing context could change fields definition -// // so dettach bean, must rebuild the fields -// -// // Dettach the bean before any thing, because with the new delegate -// // validator some old fields could not be used any longer, and then -// // listeners will never have the full reset of their model... -// -// // remove all validators. -// -// if (scopes == null || scopes.length == 0) { -// scopes = NuitonValidatorScope.values(); -// } -// -// // compute the new validator model -// NuitonValidatorModel<O> model = validatorProvider.getModel(beanType, -// context, -// scopes -// ); -// -// // remove old delegate validator -// NuitonValidator<O> delegate = validatorProvider.newValidator(model); -// } } Modified: trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidator.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidator.java 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidator.java 2014-02-04 05:48:46 UTC (rev 2607) @@ -29,7 +29,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.BeanUtil; @@ -226,7 +226,6 @@ setChanged(false); setValid(isValid0()); -// firePropertyChange(BEAN_PROPERTY, oldBean, bean); } public void addAllBeans(Collection<O> beansToAdd) { Modified: trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidatorMessage.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidatorMessage.java 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/validator/bean/list/BeanListValidatorMessage.java 2014-02-04 05:48:46 UTC (rev 2607) @@ -30,7 +30,7 @@ import java.util.List; import java.util.StringTokenizer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * TODO @@ -137,7 +137,7 @@ public String getI18nError(String error) { String text; if (!error.contains("##")) { - text = _(error); + text = t(error); } else { StringTokenizer stk = new StringTokenizer(error, "##"); String errorName = stk.nextToken(); @@ -145,7 +145,7 @@ while (stk.hasMoreTokens()) { args.add(stk.nextToken()); } - text = _(errorName, args.toArray()); + text = t(errorName, args.toArray()); } return text; } Modified: trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java 2014-02-04 05:48:46 UTC (rev 2607) @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidatorMessage.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidatorMessage.java 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidatorMessage.java 2014-02-04 05:48:46 UTC (rev 2607) @@ -30,7 +30,7 @@ import java.util.List; import java.util.StringTokenizer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * The object to box a validation message. @@ -129,7 +129,7 @@ public String getI18nError(String error) { String text; if (!error.contains("##")) { - text = _(error); + text = t(error); } else { StringTokenizer stk = new StringTokenizer(error, "##"); String errorName = stk.nextToken(); @@ -137,7 +137,7 @@ while (stk.hasMoreTokens()) { args.add(stk.nextToken()); } - text = _(errorName, args.toArray()); + text = t(errorName, args.toArray()); } return text; } Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-10-28 13:35:15 UTC (rev 2606) +++ trunk/src/site/site_fr.xml 2014-02-04 05:48:46 UTC (rev 2607) @@ -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>