- Nuiton-utils-commits - mailman.cloud.codelutin.com

r2325 - in trunk: nuiton-csv/src/site nuiton-profiling/src/site nuiton-utils/src/site nuiton-validator/src/site
by tchemit＠users.nuiton.org May 1, 2012

May 1, 2012

Author: tchemit Date: 2012-05-01 13:12:32 +0200 (Tue, 01 May 2012) New Revision: 2325 Url: http://nuiton.org/repositories/revision/nuiton-utils/2325 Log: refs #2066: Use fluido maven skin Modified: trunk/nuiton-csv/src/site/site_fr.xml trunk/nuiton-profiling/src/site/site_fr.xml trunk/nuiton-utils/src/site/site_fr.xml trunk/nuiton-validator/src/site/site_fr.xml Modified: trunk/nuiton-csv/src/site/site_fr.xml =================================================================== --- trunk/nuiton-csv/src/site/site_fr.xml 2012-05-01 10:51:36 UTC (rev 2324) +++ trunk/nuiton-csv/src/site/site_fr.xml 2012-05-01 11:12:32 UTC (rev 2325) @@ -33,11 +33,6 @@ <href>index.html</href> </bannerLeft> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> - </poweredBy> - <body> <breadcrumbs> @@ -52,5 +47,23 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/nuiton-profiling/src/site/site_fr.xml =================================================================== --- trunk/nuiton-profiling/src/site/site_fr.xml 2012-05-01 10:51:36 UTC (rev 2324) +++ trunk/nuiton-profiling/src/site/site_fr.xml 2012-05-01 11:12:32 UTC (rev 2325) @@ -57,5 +57,23 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/nuiton-utils/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils/src/site/site_fr.xml 2012-05-01 10:51:36 UTC (rev 2324) +++ trunk/nuiton-utils/src/site/site_fr.xml 2012-05-01 11:12:32 UTC (rev 2325) @@ -58,5 +58,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/nuiton-validator/src/site/site_fr.xml =================================================================== --- trunk/nuiton-validator/src/site/site_fr.xml 2012-05-01 10:51:36 UTC (rev 2324) +++ trunk/nuiton-validator/src/site/site_fr.xml 2012-05-01 11:12:32 UTC (rev 2325) @@ -58,5 +58,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>

1 0

r2324 - in trunk/nuiton-util-maven-report-plugin: . src src/license
by maven-release＠users.nuiton.org May 1, 2012

May 1, 2012

Author: maven-release Date: 2012-05-01 12:51:36 +0200 (Tue, 01 May 2012) New Revision: 2324 Url: http://nuiton.org/repositories/revision/nuiton-utils/2324 Log: fix third parties + license Added: trunk/nuiton-util-maven-report-plugin/src/license/ trunk/nuiton-util-maven-report-plugin/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-util-maven-report-plugin/LICENSE.txt Modified: trunk/nuiton-util-maven-report-plugin/LICENSE.txt =================================================================== --- trunk/nuiton-util-maven-report-plugin/LICENSE.txt 2012-05-01 10:45:30 UTC (rev 2323) +++ trunk/nuiton-util-maven-report-plugin/LICENSE.txt 2012-05-01 10:51:36 UTC (rev 2324) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 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 +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + 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. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/nuiton-util-maven-report-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-util-maven-report-plugin/src/license/THIRD-PARTY.properties 2012-05-01 10:51:36 UTC (rev 2324) @@ -0,0 +1,27 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - 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 +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue May 01 12:47:59 CEST 2012 +classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +commons-digester--commons-digester--1.6=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-10=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-velocity--1.1.7=The Apache Software License, Version 2.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 Property changes on: trunk/nuiton-util-maven-report-plugin/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

May 1, 2012

Author: tchemit Date: 2012-05-01 12:45:30 +0200 (Tue, 01 May 2012) New Revision: 2323 Url: http://nuiton.org/repositories/revision/nuiton-utils/2323 Log: fixes #2063: Introduce a new module nuiton-utils-maven-report-plugin to offers some report on usefull classes fixes #2064: Add a ApplicationConfig report Added: trunk/nuiton-util-maven-report-plugin/ trunk/nuiton-util-maven-report-plugin/LICENSE.txt trunk/nuiton-util-maven-report-plugin/README.txt trunk/nuiton-util-maven-report-plugin/changelog.txt trunk/nuiton-util-maven-report-plugin/pom.xml trunk/nuiton-util-maven-report-plugin/src/ trunk/nuiton-util-maven-report-plugin/src/main/ trunk/nuiton-util-maven-report-plugin/src/main/java/ trunk/nuiton-util-maven-report-plugin/src/main/java/org/ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java trunk/nuiton-util-maven-report-plugin/src/main/resources/ trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report.properties trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_en.properties trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_fr.properties trunk/nuiton-util-maven-report-plugin/src/site/ trunk/nuiton-util-maven-report-plugin/src/site/rst/ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigProvider.java Property changes on: trunk/nuiton-util-maven-report-plugin ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea Property changes on: trunk/nuiton-util-maven-report-plugin/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-util-maven-report-plugin/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-util-maven-report-plugin/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-util-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-util-maven-report-plugin/pom.xml (rev 0) +++ trunk/nuiton-util-maven-report-plugin/pom.xml 2012-05-01 10:45:30 UTC (rev 2323) @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils-parent</artifactId> + <version>2.4.8-SNAPSHOT</version> + </parent> + + <artifactId>nuiton-util-maven-report-plugin</artifactId> + + <packaging>maven-plugin</packaging> + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + +  +  +  + + <name>Nuiton Utils :: Nuiton Maven Report Plugin</name> + <description>Some nice maven reports for api of nuiton-util.</description> + <inceptionYear>2012</inceptionYear> + +  +  +  + + <properties> + + </properties> + + <build> + + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>l10n-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <configuration> + <locales> + <locale>fr</locale> + </locales> + </configuration> + <executions> + <execution> + <goals> + <goal>pseudo</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  +  +  + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + </links> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>l10n-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <configuration> + <locales> + <locale>fr</locale> + </locales> + </configuration> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> + +</project> Property changes on: trunk/nuiton-util-maven-report-plugin/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java (rev 0) +++ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java 2012-05-01 10:45:30 UTC (rev 2323) @@ -0,0 +1,351 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Maven Report Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.util.plugin.report; + +import org.apache.maven.doxia.siterenderer.Renderer; +import org.apache.maven.project.MavenProject; +import org.apache.maven.reporting.AbstractMavenReport; +import org.apache.maven.reporting.MavenReportException; +import org.codehaus.plexus.i18n.I18N; +import org.codehaus.plexus.util.StringUtils; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.i18n.init.I18nInitializer; +import org.nuiton.util.ApplicationConfigProvider; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.ServiceLoader; +import java.util.Set; + +/** + * Generates a report for declarated application config via the + * {@link ApplicationConfigProvider} mecanism. + * <p/> + * For each configuration, you can find all his options and actions. + * + * @author tchemit <chemit(a)codelutin.com> + * @goal application-config-report + * @requiresDependencyResolution runtime + * @requiresProject true + * @since 2.4.8 + */ +public class ApplicationConfigReport extends AbstractMavenReport { + + /** + * Report output directory. Note that this parameter is only relevant if the goal is run from the command line or + * from the default build lifecycle. If the goal is run indirectly as part of a site generation, the output + * directory configured in the Maven Site Plugin is used instead. + * + * @parameter default-value="${project.reporting.outputDirectory}" + * @required + * @since 2.4.8 + */ + private File outputDirectory; + + /** + * Report output encoding. Note that this parameter is only relevant if the goal is run from the command line or + * from the default build lifecycle. If the goal is run indirectly as part of a site generation, the output + * encoding configured in the Maven Site Plugin is used instead. + * + * @parameter expression="${outputEncoding}" default-value="${project.reporting.outputEncoding}" + * @required + * @since 2.4.8 + */ + private String outputEncoding; + + /** + * List of application config to include in report (separated by comma). + * <p/> + * <strong>Note:</strong> If not filled then will use all config found in class-path. + * + * @parameter expression="${config.include}" + * @since 2.4.8 + */ + private String include; + + /** + * List of application config to exclude from report (separated by comma). + * <p/> + * <strong>Note:</strong> If not filled no config will be exclude. + * + * @parameter expression="${config.exclude}" + * @since 2.4.8 + */ + private String exclude; + + /** + * Flag to activate verbose mode. + * <p/> + * <b>Note:</b> Verbose mode is always on if you starts a debug maven instance + * (says via {@code -X}). + * + * @parameter expression="${config.verbose}" default-value="${maven.verbose}" + * @since 2.4.8 + */ + private boolean verbose; + + /** + * Flag to render option in detail (add a section for each option). + * + * @parameter expression="${config.showOptionDetail}" default-value="true" + * @since 2.4.8 + */ + private boolean showOptionDetail; + /** + * Skip to generate the report. + * + * @parameter expression="${config.skip}" + * @since 2.4.8 + */ + private boolean skip; + + /** + * Optional i18n bundle name as used by the nuiton I18n system to init his + * files. + * <p/> + * If not given, will look at all i18n files in all over class-path (which + * could be costy if many dependencies), otherwise will init I18n system + * usinga {@link DefaultI18nInitializer} with this bundle name. + * + * @parameter expression="${config.i18nBundleName}" + * @since 2.4.8 + */ + private String i18nBundleName; + + /** + * The Maven Project. + * + * @parameter expression="${project}" + * @required + * @readonly + * @since 2.4.8 + */ + private MavenProject project; + + + /** + * List of all class path elements. + * + * @parameter default-value="${project.compileClasspathElements}" + * @required + * @readonly + * @since 2.4.8 + */ + private List<String> compileClasspathElements; + + /** + * Doxia Site Renderer. + * + * @component + * @since 2.4.8 + */ + private Renderer siteRenderer; + + /** + * Internationalization. + * + * @component + * @since 2.4.8 + */ + private I18N i18n; + + /** + * Class loader with all compile dependencies of the module in class-path + * (used to init i18n) and obtain config provider over compile class-path. + * + * @since 2.4.8 + */ + private ClassLoader newClassLoader; + + /** + * Set of ApplicationconfigProvider detected from configuration. + * + * @since 2.4.8 + */ + private Set<ApplicationConfigProvider> configProviders; + + @Override + public String getOutputName() { + return "application-config-report"; + } + + public String getDescription(Locale locale) { + return i18n.getString(getOutputName(), locale, "report.description"); + } + + public String getName(Locale locale) { + return i18n.getString(getOutputName(), locale, "report.title"); + } + + @Override + public String getCategoryName() { + return CATEGORY_PROJECT_REPORTS; + } + + @Override + public boolean canGenerateReport() { + return !skip; + } + + @Override + protected Renderer getSiteRenderer() { + return siteRenderer; + } + + @Override + protected String getOutputDirectory() { + return outputDirectory.getAbsolutePath(); + } + + @Override + protected MavenProject getProject() { + return project; + } + + @Override + protected void executeReport(Locale locale) throws MavenReportException { + + if (newClassLoader == null) { + + // not init + init(locale); + } else { + + // just change init language + I18n.setDefaultLocale(locale); + } + ApplicationConfigReportRenderer renderer = + new ApplicationConfigReportRenderer(getSink(), + i18n, + locale, + getOutputName(), + configProviders, + showOptionDetail); + renderer.render(); + } + + protected void init(Locale locale) { + if (getLog().isDebugEnabled()) { + + // debug mode set verbose flag to true + verbose = true; + } + + if (newClassLoader == null) { + List<URL> urls = new ArrayList<URL>(); + + for (String fileName : compileClasspathElements) { + File pathElem = new File(fileName); + try { + URL url = pathElem.toURI().toURL(); + urls.add(url); + getLog().debug("Added classpathElement URL " + url); + } catch (MalformedURLException e) { + throw new RuntimeException( + "Error in adding the classpath " + pathElem, e); + } + } + + newClassLoader = new URLClassLoader( + urls.toArray(new URL[urls.size()]), + Thread.currentThread().getContextClassLoader()); + } + + // get i18n initializer + I18nInitializer initializer; + if (StringUtils.isNotEmpty(i18nBundleName)) { + initializer = new DefaultI18nInitializer(i18nBundleName, + newClassLoader); + } else { + initializer = new ClassPathI18nInitializer(newClassLoader); + } + // init i18n + I18n.init(initializer, locale); + + // propagate extended classloader +// Thread.currentThread().setContextClassLoader(newClassLoader); + + if (configProviders == null) { + configProviders = new HashSet<ApplicationConfigProvider>(); + + Set<String> includes = null; + if (StringUtils.isNotEmpty(include)) { + includes = new HashSet<String>(Arrays.asList(include.split("\\s*,\\s*"))); + if (verbose) { + getLog().info("config - includes : " + includes); + } + } + + Set<String> excludes = null; + if (StringUtils.isNotEmpty(exclude)) { + excludes = new HashSet<String>(Arrays.asList(exclude.split("\\s*,\\s*"))); + if (verbose) { + getLog().info("config - excludes : " + excludes); + } + } + + ServiceLoader<ApplicationConfigProvider> loader = + ServiceLoader.load(ApplicationConfigProvider.class, + newClassLoader); + + for (ApplicationConfigProvider configProvider : loader) { + String name = configProvider.getName(); + if (includes != null && !includes.contains(name)) { + + // reject by include + if (verbose) { + getLog().info("configuration named '" + name + + "' is rejected by includes."); + } + continue; + } + if (excludes != null && excludes.contains(name)) { + + // reject by exclude + if (verbose) { + getLog().info("configuration named '" + name + + "' is rejected by excludes."); + } + continue; + } + if (verbose) { + getLog().info("configuration named '" + name + + "' will be generated."); + } + configProviders.add(configProvider); + } + } + } + +} Property changes on: trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java (rev 0) +++ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-01 10:45:30 UTC (rev 2323) @@ -0,0 +1,478 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Maven Report Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.util.plugin.report; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.reporting.AbstractMavenReportRenderer; +import org.codehaus.plexus.i18n.I18N; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ApplicationConfigProvider; + +import java.util.Arrays; +import java.util.Locale; +import java.util.Set; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Render the {@link ApplicationConfigReport} report. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4.8 + */ +public class ApplicationConfigReportRenderer extends AbstractMavenReportRenderer { + + /** + * Internationalization component. + * + * @since 2.4.8 + */ + protected final I18N i18n; + + /** + * The locale we are rendering for. + * + * @since 2.4.8 + */ + protected final Locale locale; + + /** + * The name of the bundle containing our I18n resources. + * + * @since 2.4.8 + */ + protected final String bundleName; + + /** + * Set of config providers to generate. + * + * @since 2.4.8 + */ + protected final Set<ApplicationConfigProvider> configProviders; + + + /** + * To show option in detail. + * + * @since 2.4.8 + */ + protected final boolean optionWithDetail; + + public ApplicationConfigReportRenderer(Sink sink, + I18N i18n, + Locale locale, + String bundleName, + Set<ApplicationConfigProvider> configProviders, + boolean optionWithDetail) { + super(sink); + this.i18n = i18n; + this.locale = locale; + this.bundleName = bundleName; + this.sink = sink; + this.configProviders = configProviders; + this.optionWithDetail = optionWithDetail; + } + + @Override + public String getTitle() { + return getText("report.title"); + } + + @Override + public void renderBody() { + + sink.section1(); + sink.sectionTitle1(); + sink.text(getText("report.overview.title")); + sink.sectionTitle1_(); + sink.paragraph(); + sink.lineBreak(); + sink.text(getText("report.overview.text")); + sink.paragraph_(); + sink.lineBreak(); + + renderProviderSummaryTable(); + + sink.section1_(); + + if (CollectionUtils.isNotEmpty(configProviders)) { + + sink.section1(); + sink.sectionTitle1(); + sink.text(getText("report.detail.title")); + sink.sectionTitle1_(); + sink.lineBreak(); + sink.paragraph(); + sink.text(getText("report.detail.text")); + sink.paragraph_(); + + for (ApplicationConfigProvider configProvider : configProviders) { + + renderConfigProviderDetail(configProvider); + } + + sink.section1_(); + } + } + + private void renderProviderSummaryTable() { + + if (CollectionUtils.isEmpty(configProviders)) { + + sink.text(getText("report.detail.text.noConfig")); + + } else { + sink.table(); + + sink.tableRow(); + sinkHeaderCellText(getText("report.config.name")); + sinkHeaderCellText(getText("report.config.description")); + sinkHeaderCellText(getText("report.config.nbOptions")); + sinkHeaderCellText(getText("report.config.nbActions")); + sink.tableRow_(); + + for (ApplicationConfigProvider configProvider : configProviders) { + + sink.tableRow(); + sinkCellLink(configProvider.getName(), "./application-config-report.html#detail_" + configProvider.getName()); + sinkCellText(configProvider.getDescription(locale)); + sinkCellText(configProvider.getOptions().length + ""); + sinkCellText(configProvider.getActions().length + ""); + sink.tableRow_(); + } + sink.table_(); + } + } + + private void renderConfigProviderDetail(ApplicationConfigProvider configProvider) { + + sink.section2(); + sink.sectionTitle2(); + sink.anchor("detail_" + configProvider.getName()); + sink.text(getText("report.detail.configuration.title") + " " + + configProvider.getName()); + sink.anchor_(); + sink.sectionTitle2_(); + + sink.lineBreak(); + sink.paragraph(); + sink.text(getText("report.config.name") + " : "); + sink.bold(); + sink.text(configProvider.getName()); + sink.bold_(); + sink.paragraph_(); + + sink.lineBreak(); + sink.paragraph(); + sink.text(getText("report.config.description") + " : "); + sink.bold(); + sink.text(configProvider.getDescription(locale)); + sink.bold_(); + sink.paragraph_(); + + sink.section3(); + sink.sectionTitle3(); + sink.anchor("detail_options_" + configProvider.getName()); + + sink.text(getText("report.detail.options.title")); + sink.anchor_(); + sink.sectionTitle3_(); + sink.lineBreak(); + + ApplicationConfig.OptionDef[] options = configProvider.getOptions(); + + renderOptionDefsTable(configProvider, options); + + if (optionWithDetail) { + + for (ApplicationConfig.OptionDef option : options) { + + renderProviderOptionDetail(configProvider, option); + } + } + + sink.section3_(); + + sink.section3(); + sink.sectionTitle3(); + sink.text(getText("report.detail.actions.title")); + sink.sectionTitle3_(); + sink.lineBreak(); + + renderActionDefsTable(configProvider.getActions()); + + sink.section3_(); + + sink.section2_(); + } + + protected void renderOptionDefsTable(ApplicationConfigProvider configProvider, + ApplicationConfig.OptionDef[] options) { + + if (options.length == 0) { + + sink.paragraph(); + sink.bold(); + sink.text(getText("report.detail.options.noOptions")); + sink.bold_(); + sink.paragraph_(); + + } else { + + sink.table(); + sink.tableRow(); + + sinkHeaderCellText(getText("report.config.option.key")); + sinkHeaderCellText(getText("report.config.option.description")); + if (!optionWithDetail) { + sinkHeaderCellText(getText("report.config.option.type")); + } + sinkHeaderCellText(getText("report.config.option.defaultValue")); + + if (!optionWithDetail) { + sinkHeaderCellText(getText("report.config.option.final")); + sinkHeaderCellText(getText("report.config.option.transient")); + } + sink.tableRow_(); + + for (ApplicationConfig.OptionDef option : options) { + + sink.tableRow(); + if (optionWithDetail) { + sinkCellLink( + option.getKey(), + "./application-config-report.html#detail_" + + configProvider.getName() + "_" + option.getKey()); + } else { + sinkCellText(option.getKey()); + } + sinkCellText(l_(locale, option.getDescription())); + if (!optionWithDetail) { + sinkCellText(option.getType().getName()); + } + sinkCellVerbatimText(option.getDefaultValue()); + if (!optionWithDetail) { + sinkCellText(getText(option.isFinal())); + sinkCellText(getText(option.isTransient())); + } + sink.tableRow_(); + } + + sink.table_(); + + } + } + + protected void renderActionDefsTable(ApplicationConfig.ActionDef[] actions) { + + if (actions.length == 0) { + + sink.paragraph(); + sink.bold(); + sink.text(getText("report.detail.actions.noActions")); + sink.bold_(); + sink.paragraph_(); + + } else { + + sink.table(); + + sink.tableRow(); + sinkHeaderCellText(getText("report.config.action.action")); + sinkHeaderCellText(getText("report.config.action.aliases")); + sink.tableRow_(); + + for (ApplicationConfig.ActionDef action : actions) { + sink.tableRow(); + sinkCellText(action.getAction()); + sinkCellText(l_(locale, Arrays.toString(action.getAliases()))); + sink.tableRow_(); + } + + sink.table_(); + } + } + + private void renderProviderOptionDetail(ApplicationConfigProvider configProvider, + ApplicationConfig.OptionDef option) { + + final String cellWidth = "80%"; + final String headerWidth = "20%"; + + sink.section4(); + sink.sectionTitle4(); + sink.anchor("detail_" + configProvider.getName() + "_" + option.getKey()); + sink.text(getText("report.config.option.detail") + " " + option.getKey()); + sink.sectionTitle4_(); + sink.lineBreak(); + + sink.table(); + sink.tableRows(new int[]{Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_LEFT}, false); + + sink.tableRow(); + sinkHeaderCellText(headerWidth, getText("report.config.option.key")); + sink.tableCell(cellWidth); + sink.nonBreakingSpace(); + sink.bold(); + sink.text(option.getKey()); + sink.bold_(); + sink.tableCell_(); + sink.tableRow_(); + + sink.tableRow(); + sinkHeaderCellText(headerWidth, getText("report.config.option.description")); + sink.tableCell(cellWidth); + sink.nonBreakingSpace(); + sink.text(option.getDescription()); + sink.tableCell_(); + sink.tableRow_(); + + sink.tableRow(); + sinkHeaderCellText(headerWidth, getText("report.config.option.defaultValue")); + sink.tableCell(cellWidth); + sink.nonBreakingSpace(); + sink.bold(); + sink.text(option.getDefaultValue()); + sink.bold_(); + sink.tableCell_(); + sink.tableRow_(); + + sink.tableRow(); + sinkHeaderCellText(headerWidth, getText("report.config.option.type")); + sink.tableCell(cellWidth); + sink.nonBreakingSpace(); + sink.text(option.getType().getName()); + sink.tableCell_(); + sink.tableRow_(); + + sink.tableRow(); + sinkHeaderCellText(headerWidth, getText("report.config.option.final")); + sink.tableCell(cellWidth); + sink.nonBreakingSpace(); + sink.text(getText(option.isFinal())); + sink.tableCell_(); + sink.tableRow_(); + + sink.tableRow(); + sinkHeaderCellText(headerWidth, getText("report.config.option.transient")); + sink.tableCell(cellWidth); + sink.nonBreakingSpace(); + sink.text(getText(option.isTransient())); + sink.tableCell_(); + sink.tableRow_(); + + sink.table_(); + + sink.paragraph(); + sink.link("./application-config-report.html#detail_options_" + configProvider.getName()); + sink.text(getText("report.back.options.table")); + sink.link_(); + sink.paragraph_(); + + sink.section4_(); + + } + + protected String getText(Boolean key) { + return i18n.getString(bundleName, locale, "report." + String.valueOf(key)); + } + + /** + * Gets the localized message for this report. + * + * @param key the message key. + * @return the message. + */ + protected String getText(String key) { + return i18n.getString(bundleName, locale, key); + } + + protected void renderWarningIcon() { + sink.figure(); + sink.figureGraphics("images/icon_warning_sml.gif"); + sink.figure_(); + } + + protected void renderErrorIcon() { + sink.figure(); + sink.figureGraphics("images/icon_error_sml.gif"); + sink.figure_(); + } + + protected void renderSuccessIcon() { + sink.figure(); + sink.figureGraphics("images/icon_success_sml.gif"); + sink.figure_(); + } + + protected void renderInfoIcon() { + sink.figure(); + sink.figureGraphics("images/icon_info_sml.gif"); + sink.figure_(); + } + + protected void sinkHeaderCellText(String text) { + sink.tableHeaderCell(); + sink.text(text); + sink.tableHeaderCell_(); + } + + protected void sinkHeaderCellText(String width, String text) { + sink.tableHeaderCell(width); + sink.text(text); + sink.tableHeaderCell_(); + } + + protected void sinkCellText(String width, String text) { + sink.tableCell(width); + sink.text(text); + sink.tableCell_(); + } + + protected void sinkCellText(String text) { + sink.tableCell(); + sink.text(text); + sink.tableCell_(); + } + + protected void sinkCellVerbatimText(String text) { + sink.tableCell(); + sink.verbatim(SinkEventAttributeSet.MONOSPACED); + sink.text(text); + sink.verbatim_(); + sink.tableCell_(); + } + + protected void sinkCellLink(String text, String url) { + sink.tableCell(); + sink.link(url); + sink.text(text); + sink.link_(); + sink.tableCell_(); + } + +} Property changes on: trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report.properties =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report.properties (rev 0) +++ trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report.properties 2012-05-01 10:45:30 UTC (rev 2323) @@ -0,0 +1,53 @@ +### +# #%L +# Nuiton Utils :: Nuiton Maven Report Plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +report.title=ApplicationConfig Report +report.description=Provides details of configuration options useable on the project. +report.overview.title=Overview +report.overview.text=This report summarizes all configuration options useable on the project. +report.detail.text.noConfig=No configuration found in class-path. +report.config.name=Name of configuration +report.config.description=Description +report.config.nbOptions=Number of options +report.config.nbActions=Number of actions +report.config.option.key=Key +report.config.option.description=Description +report.config.option.type=Type +report.config.option.defaultValue=Default Value +report.config.option.final=Can be modified +report.config.option.transient=Can be saved +report.config.option.detail=Details of option +report.true=Yes +report.false=No +report.back.options.table=Back to options table + +report.detail.title=Detail of configurations +report.detail.text=We give details of each configuration of the project +report.detail.configuration.title=Configuration +report.detail.options.title=Configuration options +report.detail.actions.title=Configuration actions +report.detail.options.noOptions=No option found for this configuration +report.detail.actions.noActions=No action found for this configuration + + Property changes on: trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_en.properties =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_en.properties (rev 0) +++ trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_en.properties 2012-05-01 10:45:30 UTC (rev 2323) @@ -0,0 +1,24 @@ +### +# #%L +# Nuiton Utils :: Nuiton Maven Report Plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### Property changes on: trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_fr.properties =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_fr.properties (rev 0) +++ trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_fr.properties 2012-05-01 10:45:30 UTC (rev 2323) @@ -0,0 +1,50 @@ +### +# #%L +# Nuiton Utils :: Nuiton Maven Report Plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +report.title=Rapport ApplicationConfig +report.description=Fournit des informations sur les configurations utilisables dans le projet. +report.overview.title=Pr\u00E9ambule +report.overview.text=Ce rapport d\u00E9crit les configurations utilisables dans ce projet. +report.detail.text.noConfig=Aucune configuration trouv\u00E9e dans le class-path. +report.config.option.key=Clef +report.config.option.description=Description +report.config.option.type=Type +report.config.option.defaultValue=Valeur par d\u00E9faut +report.config.option.final=Option modifiable +report.config.option.transient=Option non sauvegardable +report.config.name=Nom de la configuration +report.config.description=Description +report.config.nbOptions=Nombre d'options +report.config.nbActions=Nombre d'actions +report.config.option.detail=D\u00E9tails de l'option +report.back.options.table=Retour sur la table des options +report.true=Oui +report.false=Non +report.detail.title=D\u00E9tail des configurations +report.detail.text=On d\u00E9taille ici une par une les configurations d\u00E9finies pour le projet +report.detail.configuration.title=Configuration +report.detail.options.title=Options de la configuration +report.detail.actions.title=Actions de la configuration +report.detail.options.noOptions=Aucune option d\u00E9finie pour cette configuration +report.detail.actions.noActions=Aucune action d\u00E9finie pour cette configuration \ No newline at end of file Property changes on: trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigProvider.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigProvider.java (rev 0) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigProvider.java 2012-05-01 10:45:30 UTC (rev 2323) @@ -0,0 +1,79 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.util; + +import java.util.Locale; +import java.util.ServiceLoader; + +/** + * Provider of a {@link ApplicationConfig}. + * <p/> + * Each library of application which use {@link ApplicationConfig} should + * implements this and add the provider available via the + * {@link ServiceLoader} mecanism. + * <p/> + * Using such provider offers a nice way to find out what options can be loaded + * in a application. It also offers a simply way to generate application + * config report for documentation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4.8 + */ +public interface ApplicationConfigProvider { + + /** + * Returns the name of the provided application config. + * <p/> + * This should be the name of the library or application which offers + * the configuration. + * + * @return the name of the provided application config + */ + String getName(); + + /** + * Returns the localized description of the configuration. + * + * @param locale locale used to render description + * @return the localized description of the configuration + */ + String getDescription(Locale locale); + + /** + * Returns all options offered by the configuration. + * + * @return all options offered by the configuration + * @see ApplicationConfig.OptionDef + */ + ApplicationConfig.OptionDef[] getOptions(); + + /** + * Returns all actions offered by the configuration. + * + * @return all actions offered by the configuration. + * @see ApplicationConfig.ActionDef + */ + ApplicationConfig.ActionDef[] getActions(); +} Property changes on: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfigProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2322 - in trunk: . src/site src/site/resources src/site/resources/images src/site/resources/images/logos
by tchemit＠users.nuiton.org May 1, 2012

May 1, 2012

Author: tchemit Date: 2012-05-01 12:44:46 +0200 (Tue, 01 May 2012) New Revision: 2322 Url: http://nuiton.org/repositories/revision/nuiton-utils/2322 Log: fixes #2065: Updates to maven 3.3 fixes #2066: Use fluido maven skin Added: trunk/src/site/resources/ trunk/src/site/resources/images/ trunk/src/site/resources/images/logos/ trunk/src/site/resources/images/logos/jrst-logo.png trunk/src/site/resources/images/logos/restructuredtext-logo.png Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-01 09:38:42 UTC (rev 2321) +++ trunk/pom.xml 2012-05-01 10:44:46 UTC (rev 2322) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.2</version> + <version>3.3</version> </parent> <artifactId>nuiton-utils-parent</artifactId> @@ -42,6 +42,7 @@ <module>nuiton-csv</module> <module>nuiton-validator</module> <module>nuiton-profiling</module> + <module>nuiton-util-maven-report-plugin</module> </modules> <dependencyManagement> @@ -89,6 +90,109 @@ <scope>runtime</scope> </dependency> +  + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + <version>2.2.1</version> +  + </dependency> + + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + <version>2.1</version> +  + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + <version>1.0-beta-10</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + <version>${doxiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + <version>${doxiaVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + <version>${doxiaVersion}</version> + </dependency> </dependencies> </dependencyManagement> @@ -185,6 +289,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <aspectjVersion>1.6.12</aspectjVersion> <xworkVersion>2.3.1.2</xworkVersion> + <doxiaVersion>1.2</doxiaVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> Added: trunk/src/site/resources/images/logos/jrst-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/jrst-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/restructuredtext-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/restructuredtext-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-01 09:38:42 UTC (rev 2321) +++ trunk/src/site/site_fr.xml 2012-05-01 10:44:46 UTC (rev 2322) @@ -27,20 +27,59 @@ <project name="${project.name}"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <publishDate position="right" /> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="images/logos/restructuredtext-logo.png"/> + + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="images/logos/jrst-logo.png"/> + </poweredBy> <body> + <links> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> + </links> + <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/nuiton-utils/index.html"/> + <item name="${project.name}" + href="${project.url}/index.html"/> </breadcrumbs> <menu ref="modules"/> @@ -51,5 +90,23 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>

1 0

r2321 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org May 1, 2012

May 1, 2012

Author: tchemit Date: 2012-05-01 11:38:42 +0200 (Tue, 01 May 2012) New Revision: 2321 Url: http://nuiton.org/repositories/revision/nuiton-utils/2321 Log: depreciate more methods Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ArrayUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ArrayUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ArrayUtil.java 2012-04-03 13:53:23 UTC (rev 2320) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ArrayUtil.java 2012-05-01 09:38:42 UTC (rev 2321) @@ -37,6 +37,9 @@ package org.nuiton.util; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ObjectUtils; + import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; @@ -45,8 +48,13 @@ public class ArrayUtil { // ArrayUtil - /** empty string array useful when we want passe null, but api want String[] */ - static final String[] EMPTY_STRING_ARRAY = new String[0]; + /** + * empty string array useful when we want passe null, but api want String[] + * + * @deprecated since 2.4.8, use directly {@link ArrayUtils#EMPTY_STRING_ARRAY}. + */ + @Deprecated + static final String[] EMPTY_STRING_ARRAY = ArrayUtils.EMPTY_STRING_ARRAY; /** * Permet de convertir un tableau en une liste, le type primitif @@ -64,6 +72,14 @@ return result; } + /** + * + * @param a + * @param <T> + * @return + * @deprecated since 2.4.8, use directly {@link Arrays#asList(Object[])}. + */ + @Deprecated static public <T> List<T> asList(T[] a) { return Arrays.asList(a); }

1 0

r2320 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org April 3, 2012

April 3, 2012

Author: maven-release Date: 2012-04-03 15:53:23 +0200 (Tue, 03 Apr 2012) New Revision: 2320 Url: http://nuiton.org/repositories/revision/nuiton-utils/2320 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-04-03 13:53:21 UTC (rev 2319) +++ trunk/nuiton-csv/pom.xml 2012-04-03 13:53:23 UTC (rev 2320) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7</version> + <version>2.4.8-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-04-03 13:53:21 UTC (rev 2319) +++ trunk/nuiton-profiling/pom.xml 2012-04-03 13:53:23 UTC (rev 2320) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7</version> + <version>2.4.8-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-04-03 13:53:21 UTC (rev 2319) +++ trunk/nuiton-utils/pom.xml 2012-04-03 13:53:23 UTC (rev 2320) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7</version> + <version>2.4.8-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-04-03 13:53:21 UTC (rev 2319) +++ trunk/nuiton-validator/pom.xml 2012-04-03 13:53:23 UTC (rev 2320) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7</version> + <version>2.4.8-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 13:53:21 UTC (rev 2319) +++ trunk/pom.xml 2012-04-03 13:53:23 UTC (rev 2320) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7</version> + <version>2.4.8-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -212,12 +212,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.7 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.7 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <distributionManagement>

1 0

r2319 - in tags: . nuiton-utils-2.4.7
by maven-release＠users.nuiton.org April 3, 2012

April 3, 2012

Author: maven-release Date: 2012-04-03 15:53:21 +0200 (Tue, 03 Apr 2012) New Revision: 2319 Url: http://nuiton.org/repositories/revision/nuiton-utils/2319 Log: [maven-release-plugin] copy for tag nuiton-utils-2.4.7 Added: tags/nuiton-utils-2.4.7/ Property changes on: tags/nuiton-utils-2.4.7 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2318 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org April 3, 2012

April 3, 2012

Author: maven-release Date: 2012-04-03 15:53:19 +0200 (Tue, 03 Apr 2012) New Revision: 2318 Url: http://nuiton.org/repositories/revision/nuiton-utils/2318 Log: [maven-release-plugin] prepare release nuiton-utils-2.4.7 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-04-03 13:51:22 UTC (rev 2317) +++ trunk/nuiton-csv/pom.xml 2012-04-03 13:53:19 UTC (rev 2318) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7-SNAPSHOT</version> + <version>2.4.7</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-04-03 13:51:22 UTC (rev 2317) +++ trunk/nuiton-profiling/pom.xml 2012-04-03 13:53:19 UTC (rev 2318) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7-SNAPSHOT</version> + <version>2.4.7</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-04-03 13:51:22 UTC (rev 2317) +++ trunk/nuiton-utils/pom.xml 2012-04-03 13:53:19 UTC (rev 2318) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7-SNAPSHOT</version> + <version>2.4.7</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-04-03 13:51:22 UTC (rev 2317) +++ trunk/nuiton-validator/pom.xml 2012-04-03 13:53:19 UTC (rev 2318) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7-SNAPSHOT</version> + <version>2.4.7</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 13:51:22 UTC (rev 2317) +++ trunk/pom.xml 2012-04-03 13:53:19 UTC (rev 2318) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.7-SNAPSHOT</version> + <version>2.4.7</version> <modules> <module>nuiton-utils</module> @@ -212,12 +212,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.7 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.7 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> </scm> <distributionManagement>

1 0

r2317 - in trunk: nuiton-csv/src/main/java/org/nuiton/util/csv nuiton-csv/src/test/java/org/nuiton/util/csv nuiton-validator/src/license
by tchemit＠users.nuiton.org April 3, 2012

April 3, 2012

Author: tchemit Date: 2012-04-03 15:51:22 +0200 (Tue, 03 Apr 2012) New Revision: 2317 Url: http://nuiton.org/repositories/revision/nuiton-utils/2317 Log: svn properties + missing headers Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/CsvModel.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java trunk/nuiton-validator/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/CsvModel.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/CsvModel.java 2012-04-03 13:33:26 UTC (rev 2316) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/CsvModel.java 2012-04-03 13:51:22 UTC (rev 2317) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.csv; import java.util.List; Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/CsvModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java 2012-04-03 13:33:26 UTC (rev 2316) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java 2012-04-03 13:51:22 UTC (rev 2317) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.csv; import java.util.LinkedList; Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java 2012-04-03 13:33:26 UTC (rev 2316) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java 2012-04-03 13:51:22 UTC (rev 2317) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.csv; import org.apache.commons.logging.Log; Property changes on: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java 2012-04-03 13:33:26 UTC (rev 2316) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java 2012-04-03 13:51:22 UTC (rev 2317) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.csv; import org.apache.commons.io.IOUtils; Property changes on: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java 2012-04-03 13:33:26 UTC (rev 2316) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java 2012-04-03 13:51:22 UTC (rev 2317) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.csv; import java.util.Date; Property changes on: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java 2012-04-03 13:33:26 UTC (rev 2316) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java 2012-04-03 13:51:22 UTC (rev 2317) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.csv; class RowBeanExportModel implements ExportModel<RowBean> { Property changes on: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-validator/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-validator/src/license/THIRD-PARTY.properties 2012-04-03 13:33:26 UTC (rev 2316) +++ trunk/nuiton-validator/src/license/THIRD-PARTY.properties 2012-04-03 13:51:22 UTC (rev 2317) @@ -2,23 +2,19 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - 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 -# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 -# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Sep 09 18:43:17 CEST 2011 -asm--asm--3.1=http\://asm.ow2.org/license.html -asm--asm-commons--3.1=http\://asm.ow2.org/license.html -asm--asm-tree--3.1=http\://asm.ow2.org/license.html +#Tue Apr 03 15:50:05 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL)

1 0

r2316 - in trunk/nuiton-utils/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org April 3, 2012

April 3, 2012

Author: tchemit Date: 2012-04-03 15:33:26 +0200 (Tue, 03 Apr 2012) New Revision: 2316 Url: http://nuiton.org/repositories/revision/nuiton-utils/2316 Log: fixes #2048: BeanMonitor says null objects are not equals! Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2012-03-22 20:49:19 UTC (rev 2315) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2012-04-03 13:33:26 UTC (rev 2316) @@ -24,6 +24,7 @@ */ package org.nuiton.util.beans; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -71,12 +72,6 @@ /** Names of monitored and modified properties for the attached bean. */ protected final Map<String, PropertyDiff> propertyDiffs; -// /** Names of monitored and modified properties for the attached bean. */ -// protected final Set<String> modifiedProperties; -// -// /** To store the original values when watched properties are changing. */ -// protected final Map<String, Object> originalValues; - /** * The {@link PropertyChangeListener} which listen modification on bean * only on monitored properties. @@ -93,8 +88,6 @@ */ public BeanMonitor(String... propertyNames) { this.propertyNames = Arrays.asList(propertyNames); -// modifiedProperties = new LinkedHashSet<String>(); -// originalValues = new TreeMap<String, Object>(); propertyDiffs = new LinkedHashMap<String, PropertyDiff>(); listener = new PropertyChangeListener() { @@ -122,26 +115,29 @@ // check if value did not come back to original Object originalValue = propertyDiff.getSourceValue(); - if (originalValue == null && newValue == null || - originalValue != null && originalValue.equals(newValue)) { + if (ObjectUtils.equals(originalValue, newValue)) { + // coming back to original value // the property is no more modified propertyDiffs.remove(propertyName); -// return; } } else { - propertyDiff = new PropertyDiff( - propertyName, - oldValue, - propertyName, - newValue, - null - ); - // add it to modified properties - propertyDiffs.put(propertyName, propertyDiff); + // check old value and newvalue are real not equals + if (ObjectUtils.notEqual(newValue, oldValue)) { + propertyDiff = new PropertyDiff( + propertyName, + oldValue, + propertyName, + newValue, + null + ); + // add it to modified properties + propertyDiffs.put(propertyName, propertyDiff); + } + } // if (modifiedProperties.contains(propertyName)) { Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java 2012-03-22 20:49:19 UTC (rev 2315) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java 2012-04-03 13:33:26 UTC (rev 2316) @@ -104,6 +104,24 @@ } + @Test + public void testMonitorAno2048() throws Exception { + + BeanMonitor monitor = new BeanMonitor(BeanA.PROPERTY_A, + BeanA.PROPERTY_B, + BeanA.PROPERTY_E + ); + + BeanA bean = new BeanA(); + bean.setB(null); + + monitor.setBean(bean); + + // ano #2048 : no modification with two null properties + bean.setB(null); + assertMonitor(monitor); + } + protected void assertMonitor(BeanMonitor monitor, Object... propertyNamesAndOriginalValues) {

1 0