Author: tchemit Date: 2012-05-01 14:50:35 +0200 (Tue, 01 May 2012) New Revision: 2329 Url: http://nuiton.org/repositories/revision/nuiton-utils/2329 Log: refs #2064: Add a ApplicationConfig report Modified: trunk/nuiton-util-maven-report-plugin/src/license/THIRD-PARTY.properties 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/application-config-report.properties trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_fr.properties trunk/nuiton-util-maven-report-plugin/src/site/apt/index.apt trunk/nuiton-util-maven-report-plugin/src/site/apt/usage.apt.vm trunk/nuiton-util-maven-report-plugin/src/site/site_fr.xml trunk/pom.xml Property changes on: trunk/nuiton-util-maven-report-plugin/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Modified: 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 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java 2012-05-01 12:50:35 UTC (rev 2329) @@ -34,6 +34,7 @@ import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.I18nInitializer; +import org.nuiton.util.ApplicationConfigHelper; import org.nuiton.util.ApplicationConfigProvider; import java.io.File; @@ -45,7 +46,6 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.ServiceLoader; import java.util.Set; /** @@ -122,6 +122,7 @@ * @since 2.4.8 */ private boolean showOptionDetail; + /** * Skip to generate the report. * @@ -293,11 +294,7 @@ // 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)) { @@ -315,36 +312,12 @@ } } - 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); - } + configProviders = ApplicationConfigHelper.getProviders( + newClassLoader, + includes, + excludes, + verbose + ); } } Modified: 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 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/nuiton-util-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-01 12:50:35 UTC (rev 2329) @@ -109,10 +109,16 @@ sink.sectionTitle1(); sink.text(getText("report.overview.title")); sink.sectionTitle1_(); + sink.lineBreak(); sink.paragraph(); - sink.lineBreak(); sink.text(getText("report.overview.text")); sink.paragraph_(); + + sink.paragraph(); + sink.link("http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/ApplicationConfig.htm..."); + sink.text(getText("report.overview.more.information")); + sink.link_(); + sink.paragraph_(); sink.lineBreak(); renderProviderSummaryTable(); Modified: 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 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report.properties 2012-05-01 12:50:35 UTC (rev 2329) @@ -38,10 +38,10 @@ report.config.option.final=Can be modified report.config.option.transient=Can be saved report.config.option.detail=Details of option +report.overview.more.information=More inforation about ApplicationConfig 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 Modified: 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 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/nuiton-util-maven-report-plugin/src/main/resources/application-config-report_fr.properties 2012-05-01 12:50:35 UTC (rev 2329) @@ -39,6 +39,7 @@ 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.overview.more.information=Pour plus d'informations sur ApplicationConfig report.true=Oui report.false=Non report.detail.title=D\u00E9tail des configurations Modified: trunk/nuiton-util-maven-report-plugin/src/site/apt/index.apt =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/site/apt/index.apt 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/nuiton-util-maven-report-plugin/src/site/apt/index.apt 2012-05-01 12:50:35 UTC (rev 2329) @@ -1,3 +1,27 @@ +~~~ +~~ #%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% +~~~ ------ Nuiton-utils-maven-report-plugin ------ Property changes on: trunk/nuiton-util-maven-report-plugin/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-util-maven-report-plugin/src/site/apt/usage.apt.vm =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/site/apt/usage.apt.vm 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/nuiton-util-maven-report-plugin/src/site/apt/usage.apt.vm 2012-05-01 12:50:35 UTC (rev 2329) @@ -31,8 +31,11 @@ ------------------------------------------------------------------------------- Si votre application utilise le mode bundle d'i18n, il est alors possible de - préciser le nom du bundle i18n où sont regroupées toutes les traductions : + préciser le nom du bundle i18n où sont regroupées toutes les traductions. + A noter que dans ce cas, le fichier de bundle doit être généré, il faut donc + toujours avoir effectué une compilation avant de générer le site. + ------------------------------------------------------------------------------- <reporting> <plugins> Property changes on: trunk/nuiton-util-maven-report-plugin/src/site/apt/usage.apt.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-util-maven-report-plugin/src/site/site_fr.xml =================================================================== --- trunk/nuiton-util-maven-report-plugin/src/site/site_fr.xml 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/nuiton-util-maven-report-plugin/src/site/site_fr.xml 2012-05-01 12:50:35 UTC (rev 2329) @@ -3,8 +3,8 @@ #%L Nuiton Utils - $Id: site_fr.xml 2322 2012-05-01 10:44:46Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/src/site/site_fr.xml $ + $Id$ + $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin %% Property changes on: trunk/nuiton-util-maven-report-plugin/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-01 12:49:55 UTC (rev 2328) +++ trunk/pom.xml 2012-05-01 12:50:35 UTC (rev 2329) @@ -136,7 +136,7 @@ <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> - <version>2.1</version> + <version>2.2</version> <!--<scope>provided</scope>--> </dependency> @@ -289,7 +289,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <aspectjVersion>1.6.12</aspectjVersion> <xworkVersion>2.3.1.2</xworkVersion> - <doxiaVersion>1.2</doxiaVersion> + <doxiaVersion>1.3</doxiaVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>