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

r2355 - trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report
by tchemit＠users.nuiton.org May 29, 2012

May 29, 2012

Author: tchemit Date: 2012-05-29 16:17:42 +0200 (Tue, 29 May 2012) New Revision: 2355 Url: http://nuiton.org/repositories/revision/nuiton-utils/2355 Log: fix optional report parameter Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java 2012-05-29 13:46:28 UTC (rev 2354) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java 2012-05-29 14:17:42 UTC (rev 2355) @@ -84,7 +84,6 @@ * usinga {@link DefaultI18nInitializer} with this bundle name. * * @parameter expression="${config.i18nBundleName}" - * @required * @since 2.4.8 */ private String i18nBundleName;

1 0

r2354 - in trunk/nuiton-utils-maven-report-plugin/src: main/java/org/nuiton/util/plugin/report site
by tchemit＠users.nuiton.org May 29, 2012

May 29, 2012

Author: tchemit Date: 2012-05-29 15:46:28 +0200 (Tue, 29 May 2012) New Revision: 2354 Url: http://nuiton.org/repositories/revision/nuiton-utils/2354 Log: fix headers Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-29 13:44:19 UTC (rev 2353) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-29 13:46:28 UTC (rev 2354) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-05-29 13:44:19 UTC (rev 2353) +++ trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-05-29 13:46:28 UTC (rev 2354) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils + Nuiton Utils :: Nuiton Maven Report Plugin $Id$ $HeadURL$ %% - Copyright (C) 2012 CodeLutin, tony Chemit + Copyright (C) 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as

1 0

r2353 - in trunk/nuiton-utils-maven-report-plugin: . src/main/java/org/nuiton/util/plugin/report src/site src/site/apt
by tchemit＠users.nuiton.org May 29, 2012

May 29, 2012

Author: tchemit Date: 2012-05-29 15:44:19 +0200 (Tue, 29 May 2012) New Revision: 2353 Url: http://nuiton.org/repositories/revision/nuiton-utils/2353 Log: fixes #2115: Add a aggregate application-config-report Added: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java trunk/nuiton-utils-maven-report-plugin/src/site/apt/index.apt trunk/nuiton-utils-maven-report-plugin/src/site/apt/usage.apt.vm trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-05-28 09:21:40 UTC (rev 2352) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-05-29 13:44:19 UTC (rev 2353) @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils :: Nuiton Validator - $Id$ - $HeadURL$ + Nuiton Utils :: Nuiton Maven Report Plugin %% - Copyright (C) 2011 CodeLutin, Tony Chemit + Copyright (C) 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -165,6 +163,11 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> </build> @@ -185,7 +188,13 @@ <reporting> <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>${pluginPluginVersion}</version> + </plugin> + + <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <quiet>true</quiet> Added: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java (rev 0) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java 2012-05-29 13:44:19 UTC (rev 2353) @@ -0,0 +1,313 @@ +/* + * #%L + * Nuiton Utils :: Maven Report Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Tony Chemit + * %% + * 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.ApplicationConfigHelper; +import org.nuiton.util.ApplicationConfigProvider; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Locale; +import java.util.Set; + +/** + * Abstract application config report used by normal and aggregate report. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4.9 + */ +public abstract class AbstractApplicationConfigReport 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; + + /** + * Optional i18n bundle name as used by the nuiton I18n system to init his + * files. + * + * 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}" + * @required + * @since 2.4.8 + */ + private String i18nBundleName; + + /** + * List of application config to include in report (separated by comma). + * + * Note: 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). + * + * Note: If not filled no config will be exclude. + * + * @parameter expression="${config.exclude}" + * @since 2.4.8 + */ + private String exclude; + + /** + * Flag to activate verbose mode. + * + * Note: 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; + + /** + * The Maven Project. + * + * @parameter expression="${project}" + * @required + * @readonly + * @since 2.4.8 + */ + private MavenProject project; + + + /** + * 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; + } + + protected abstract ClassLoader createClassLoader() throws MavenReportException; + + @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) throws MavenReportException { + if (getLog().isDebugEnabled()) { + + // debug mode set verbose flag to true + verbose = true; + } + + if (newClassLoader == null) { + + newClassLoader = createClassLoader(); + } + + // 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); + + if (configProviders == null) { + + 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); + } + } + + configProviders = ApplicationConfigHelper.getProviders( + newClassLoader, + includes, + excludes, + verbose + ); + } + } + + protected ClassLoader createClassLoader(Set<String> paths) { + + Set<URL> urls = new HashSet<URL>(); + + for (String fileName : paths) { + 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); + } + } + + return new URLClassLoader( + urls.toArray(new URL[urls.size()]), + Thread.currentThread().getContextClassLoader()); + } +} Property changes on: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AbstractApplicationConfigReport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java (rev 0) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java 2012-05-29 13:44:19 UTC (rev 2353) @@ -0,0 +1,76 @@ +/* + * #%L + * Nuiton Utils :: Maven Report Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Tony Chemit + * %% + * 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.artifact.DependencyResolutionRequiredException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.reporting.MavenReportException; +import org.nuiton.util.ApplicationConfigProvider; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * Generates a report for declarated application config via the + * {@link ApplicationConfigProvider} mecanism on a aggregate mojo. + * + * For each configuration, you can find all his options and actions. + * + * @author tchemit <chemit(a)codelutin.com> + * @goal aggregate-application-config-report + * @requiresDependencyResolution runtime + * @requiresProject true + * @aggregator + * @since 2.4.9 + */ +public class AggregateApplicationConfigReport extends AbstractApplicationConfigReport { + + /** + * The projects in the reactor. + * + * @parameter expression="${reactorProjects}" + * @readonly + * @required + * @since 1.0 + */ + protected List<?> reactorProjects; + + @Override + protected ClassLoader createClassLoader() throws MavenReportException { + Set<String> paths = new HashSet<String>(); + + for (Object o : reactorProjects) { + MavenProject p = (MavenProject) o; + List runtimeClasspathElements = null; + try { + runtimeClasspathElements = p.getRuntimeClasspathElements(); + paths.addAll(runtimeClasspathElements); + } catch (DependencyResolutionRequiredException e) { + throw new MavenReportException("Could not obtain dependencies for project " + p); + } + } + return createClassLoader(paths); + } +} Property changes on: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/AggregateApplicationConfigReport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java 2012-05-28 09:21:40 UTC (rev 2352) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReport.java 2012-05-29 13:44:19 UTC (rev 2353) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -24,29 +24,10 @@ */ 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.ApplicationConfigHelper; 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.Set; /** * Generates a report for declarated application config via the @@ -60,102 +41,9 @@ * @requiresProject true * @since 2.4.8 */ -public class ApplicationConfigReport extends AbstractMavenReport { +public class ApplicationConfigReport extends AbstractApplicationConfigReport { /** - * 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). - * - * Note: 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). - * - * Note: If not filled no config will be exclude. - * - * @parameter expression="${config.exclude}" - * @since 2.4.8 - */ - private String exclude; - - /** - * Flag to activate verbose mode. - * - * Note: 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. - * - * 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.runtimeClasspathElements}" @@ -165,160 +53,9 @@ */ private List<String> runtimeClasspathElements; - /** - * 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"; + protected ClassLoader createClassLoader() { + return createClassLoader(new HashSet<String>(runtimeClasspathElements)); } - 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 : runtimeClasspathElements) { - 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); - - if (configProviders == null) { - - 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); - } - } - - configProviders = ApplicationConfigHelper.getProviders( - newClassLoader, - includes, - excludes, - verbose - ); - } - } - } Modified: trunk/nuiton-utils-maven-report-plugin/src/site/apt/index.apt =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/site/apt/index.apt 2012-05-28 09:21:40 UTC (rev 2352) +++ trunk/nuiton-utils-maven-report-plugin/src/site/apt/index.apt 2012-05-29 13:44:19 UTC (rev 2353) @@ -5,7 +5,7 @@ ~~ $Id$ ~~ $HeadURL$ ~~ %% -~~ Copyright (C) 2012 CodeLutin +~~ Copyright (C) 2012 CodeLutin, Tony Chemit ~~ %% ~~ This program is free software: you can redistribute it and/or modify ~~ it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-utils-maven-report-plugin/src/site/apt/usage.apt.vm =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/site/apt/usage.apt.vm 2012-05-28 09:21:40 UTC (rev 2352) +++ trunk/nuiton-utils-maven-report-plugin/src/site/apt/usage.apt.vm 2012-05-29 13:44:19 UTC (rev 2353) @@ -1,3 +1,27 @@ +~~~ +~~ #%L +~~ Nuiton Utils :: Nuiton Maven Report Plugin +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2012 CodeLutin, Tony Chemit +~~ %% +~~ 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% +~~~ ------ Usage ------ @@ -36,6 +60,8 @@ 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. + Pour plus de détail sur ce report : {{{./application-config-report-mojo.html}documentation du plugin}}. + ------------------------------------------------------------------------------- <reporting> <plugins> @@ -57,3 +83,37 @@ </plugins> </reporting> ------------------------------------------------------------------------------- + +* Générer un rapport pour l'utilisation d'ApplicationConfig en mode aggregate + + Pour une application multi-module, il peut-être intéressant de générer le + rapport au niveau du super-pom du projet. Pour cela on utilise un + report <aggregate> comme dans l'example suivant : + +------------------------------------------------------------------------------- + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-util-maven-report-plugin</artifactId> + <version>${project.version}</version> + <reportSets> + <reportSet> + <reports> + <report>aggregate-application-config-report</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <i18nBundleName>nomDeMonBundle</i18nBundleName> + </configuration> + </plugin> + </plugins> + </reporting> +------------------------------------------------------------------------------- + + Il faut alors comme pour le report précédent qu'au moins le module + contenant l'implantation d'application config soit construit. + + Pour plus de détail sur ce report : {{{./aggregate-application-config-report-mojo.html}documentation du plugin}}. + Modified: trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-05-28 09:21:40 UTC (rev 2352) +++ trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-05-29 13:44:19 UTC (rev 2353) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2012 CodeLutin, tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,6 +39,7 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Utilisation" href="usage.html"/> + <item name="Documentation du plugin" href="plugin-info.html"/> </menu> <menu ref="reports"/>

1 0

r2352 - in trunk: nuiton-csv/src/site nuiton-profiling/src/site nuiton-utils/src/site nuiton-utils-maven-report-plugin/src/site nuiton-validator/src/site src/site
by tchemit＠users.nuiton.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 11:21:40 +0200 (Mon, 28 May 2012) New Revision: 2352 Url: http://nuiton.org/repositories/revision/nuiton-utils/2352 Log: fix scm url for site edition Modified: trunk/nuiton-csv/src/site/site_fr.xml trunk/nuiton-profiling/src/site/site_fr.xml trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml trunk/nuiton-utils/src/site/site_fr.xml trunk/nuiton-validator/src/site/site_fr.xml trunk/src/site/site_fr.xml Modified: trunk/nuiton-csv/src/site/site_fr.xml =================================================================== --- trunk/nuiton-csv/src/site/site_fr.xml 2012-05-28 07:55:26 UTC (rev 2351) +++ trunk/nuiton-csv/src/site/site_fr.xml 2012-05-28 09:21:40 UTC (rev 2352) @@ -57,7 +57,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/nuiton-profiling/src/site/site_fr.xml =================================================================== --- trunk/nuiton-profiling/src/site/site_fr.xml 2012-05-28 07:55:26 UTC (rev 2351) +++ trunk/nuiton-profiling/src/site/site_fr.xml 2012-05-28 09:21:40 UTC (rev 2352) @@ -67,7 +67,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/nuiton-utils/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils/src/site/site_fr.xml 2012-05-28 07:55:26 UTC (rev 2351) +++ trunk/nuiton-utils/src/site/site_fr.xml 2012-05-28 09:21:40 UTC (rev 2352) @@ -68,7 +68,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-05-28 07:55:26 UTC (rev 2351) +++ trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-05-28 09:21:40 UTC (rev 2352) @@ -53,7 +53,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/nuiton-validator/src/site/site_fr.xml =================================================================== --- trunk/nuiton-validator/src/site/site_fr.xml 2012-05-28 07:55:26 UTC (rev 2351) +++ trunk/nuiton-validator/src/site/site_fr.xml 2012-05-28 09:21:40 UTC (rev 2352) @@ -68,7 +68,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-28 07:55:26 UTC (rev 2351) +++ trunk/src/site/site_fr.xml 2012-05-28 09:21:40 UTC (rev 2352) @@ -100,7 +100,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r2351 - trunk
by maven-release＠users.nuiton.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 09:55:26 +0200 (Mon, 28 May 2012) New Revision: 2351 Url: http://nuiton.org/repositories/revision/nuiton-utils/2351 Log: updates to mavenpom 3.3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-23 11:51:35 UTC (rev 2350) +++ trunk/pom.xml 2012-05-28 07:55:26 UTC (rev 2351) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.1</version> + <version>3.3.2</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2350 - trunk/nuiton-csv/src/main/java/org/nuiton/util/csv
by tchemit＠users.nuiton.org May 23, 2012

May 23, 2012

Author: tchemit Date: 2012-05-23 13:51:35 +0200 (Wed, 23 May 2012) New Revision: 2350 Url: http://nuiton.org/repositories/revision/nuiton-utils/2350 Log: fixes Anomalie #2101: ImportToMap does not compile under jdk 7 Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java 2012-05-05 14:06:38 UTC (rev 2349) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java 2012-05-23 11:51:35 UTC (rev 2350) @@ -43,13 +43,13 @@ */ public class ImportToMap extends Import<Map<String, Object>> { - public static ImportToMap newImport(ImportModel<Map<String, Object>> model, - InputStream inputStream) { + public static ImportToMap newImportToMap(ImportModel<Map<String, Object>> model, + InputStream inputStream) { return new ImportToMap(model, inputStream); } - public static ImportToMap newImport(ImportModel<Map<String, Object>> model, - Reader reader) { + public static ImportToMap newImportToMap(ImportModel<Map<String, Object>> model, + Reader reader) { return new ImportToMap(model, reader); }

1 0

r2349 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bpoussin＠users.nuiton.org May 5, 2012

May 5, 2012

Author: bpoussin Date: 2012-05-05 16:06:38 +0200 (Sat, 05 May 2012) New Revision: 2349 Url: http://nuiton.org/repositories/revision/nuiton-utils/2349 Log: ajout d'un test unitaire pour getSubConfig et petite correction Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2012-05-05 01:32:04 UTC (rev 2348) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2012-05-05 14:06:38 UTC (rev 2349) @@ -470,6 +470,18 @@ * @since 2.4.8 */ public ApplicationConfig(Properties defaults, String configFilename) { + init(defaults, configFilename); + } + + /** + * On separt l'init du corps du constructeur, car les sous classes ne doivent + * pas l'executer. + * + * @param defaults + * @param configFilename + * @since 2.4.9 + */ + protected void init(Properties defaults, String configFilename) { if (defaults != null) { // iterate with Properties method and not with Hashtable method to // prevent missed value with chained Properties object @@ -2202,6 +2214,11 @@ this.prefix = prefix; } + @Override + protected void init(Properties defaults, String configFilename) { + // do nothing + } + public ApplicationConfig getParent() { return parent; } Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2012-05-05 01:32:04 UTC (rev 2348) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2012-05-05 14:06:38 UTC (rev 2349) @@ -237,6 +237,28 @@ Assert.assertEquals("bidulle", instance.getOption("truc")); } + @Test + public void testSubConfig() { + ApplicationConfig instance = new ApplicationConfig(); + Assert.assertEquals(null, instance.getOption("truc")); + instance.setOption("truc", "bidulle"); + instance.setOption("machin", "chouette"); + instance.setOption("toto.truc", "AutreBidulle"); + instance.setOption("toto.specific", "theOne"); + Assert.assertEquals("bidulle", instance.getOption("truc")); + + ApplicationConfig sub = instance.getSubConfig("toto."); + // test la surcharge du default + Assert.assertEquals("AutreBidulle", sub.getOption("truc")); + // test l'utilisation du default + Assert.assertEquals("chouette", sub.getOption("machin")); + // test une valeur specifique au sub + Assert.assertEquals("theOne", sub.getOption("specific")); + + // TODO ajouter d'autres tests, pour les autres methodes surchargee + // TODO ajouter d'autres tests pour des sub-(sub-(sub)) config + } + /** * Test convertion to list */

1 0

r2348 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org May 5, 2012

May 5, 2012

Author: bpoussin Date: 2012-05-05 03:32:04 +0200 (Sat, 05 May 2012) New Revision: 2348 Url: http://nuiton.org/repositories/revision/nuiton-utils/2348 Log: Evolution #1993 [ApplicationConfig] new method to get sub-config from prefix value (manque le test unitaire, mais pas le courage maintenant :() Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2012-05-02 14:02:15 UTC (rev 2347) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2012-05-05 01:32:04 UTC (rev 2348) @@ -1271,6 +1271,17 @@ } /** + * Return sub config that encapsulate this ApplicationConfig + * @param prefix prefix to put automaticaly at beginning of all key + * @return + * @since 2.4.9 + */ + public SubApplicationConfig getSubConfig(String prefix) { + SubApplicationConfig result = new SubApplicationConfig(this, prefix); + return result; + } + + /** * Permet de recuperer l'ensemble des options commencant par une certaine * chaine. * @@ -2164,6 +2175,160 @@ }; /** + * Permet de masquer un prefix. Il est possible d'avoir des valeurs par + * defaut. Par exemple: + * <pre> + * monOption=toto + * monPrefix.monOption=titi + * </pre> + * + * <li>Si on cree le subApp avec le prefix "monPrefix." et qu'on demande la valeur + * de "monOption", la valeur retournee est "titi". + * <li>Si on cree le subApp avec le prefix "monAutrePrefix." et qu'on demande la valeur + * de "monOption", la valeur retournee est "toto" (valeur par defaut de monOption. + * + * Certaines methodes retournees ne sont pas + * surchargee et ne masque pas le prefix: + * <li>getOptions() + * @since 2.4.9 + */ + static public class SubApplicationConfig extends ApplicationConfig { + + protected ApplicationConfig parent; + protected String prefix; + + public SubApplicationConfig(ApplicationConfig parent, String prefix) { + this.parent = parent; + this.prefix = prefix; + } + + public ApplicationConfig getParent() { + return parent; + } + + public String getPrefix() { + return prefix; + } + + @Override + public Properties getOptions() { + return getParent().getOptions(); + } + + @Override + public void setDefaultOption(String key, String value) { + getParent().setDefaultOption(getPrefix() + key, value); + } + + @Override + public boolean hasOption(String key) { + return getParent().hasOption(getPrefix() + key); + } + + @Override + public void setOption(String key, String value) { + getParent().setOption(getPrefix() + key, value); + } + + /** + * Surcharge pour recherche la cle avec le prefix. Si on ne la retrouve + * pas, on recherche sans le prefix pour permettre d'avoir des valeurs + * par defaut + * @param key La cle de l'option + * @return + */ + @Override + public String getOption(String key) { + String result; + if (hasOption(key)) { + result = getParent().getOption(getPrefix() + key); + } else { + result = getParent().getOption(key); + } + return result; + } + + /** + * Surcharge de la methode pour que les options commencant par le prefix + * soit modifiee pour qu'elle est la meme cle sans le prefix. Le but + * est de garder les autres options et si une option avait le meme nom + * qu'elle soit effacee par celle dont on a supprime le prefix + * @param replaceInner + * @return + */ + @Override + public Properties getFlatOptions(boolean replaceInner) { + Properties result = getParent().getFlatOptions(replaceInner); + Properties tmp = new Properties(); + int lenght = getPrefix().length(); + for (Map.Entry e : result.entrySet()) { + String k = (String)e.getKey(); + if (k.startsWith(getPrefix())) { + k = k.substring(lenght); + String v = (String)e.getValue(); + tmp.setProperty(k, v); + } + } + result.putAll(tmp); + return result; + } + + /** + * Surcharge pour recupere les valeurs commencant par le prefix demande + * en plus du prefix 'sub'. Les options sont ensuite fusionnee pour + * permettre aussi les valeurs par defaut + * @param prefix + * @return + */ + @Override + public Properties getOptionStartsWith(String prefix) { + Properties result = getParent().getOptionStartsWith(prefix); + Properties tmp = getParent().getOptionStartsWith(getPrefix() + prefix); + int lenght = getPrefix().length(); + for (Map.Entry e : tmp.entrySet()) { + String k = (String)e.getKey(); + k = k.substring(lenght); + String v = (String)e.getValue(); + // on ajout/ecrase les valeurs de result + result.setProperty(k, v); + } + return result; + } + + @Override + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + if (propertyName.startsWith(getPrefix())) { + propertyName = propertyName.substring(getPrefix().length()); + getParent().firePropertyChange(propertyName, oldValue, newValue); + } // else not fire event + } + + @Override + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + getParent().addPropertyChangeListener(getPrefix() + propertyName, listener); + } + + @Override + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + getParent().removePropertyChangeListener(getPrefix() + propertyName, listener); + } + + @Override + public boolean hasListeners(String propertyName) { + return getParent().hasListeners(getPrefix() + propertyName); + } + + // methode interdite dans le sub + + @Override + public ApplicationConfig parse(String... args) throws ArgumentsParserException { + throw new UnsupportedOperationException("This method is not supported in SubApplicationConfig"); + } + + + } + + /** * Le contrat de marquage des options, on utilise cette interface pour * caracteriser une option de configuration. *

1 0

r2347 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org May 2, 2012

May 2, 2012

Author: maven-release Date: 2012-05-02 16:02:15 +0200 (Wed, 02 May 2012) New Revision: 2347 Url: http://nuiton.org/repositories/revision/nuiton-utils/2347 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils-maven-report-plugin/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-05-02 14:02:14 UTC (rev 2346) +++ trunk/nuiton-csv/pom.xml 2012-05-02 14:02:15 UTC (rev 2347) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.8</version> + <version>2.4.9-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-05-02 14:02:14 UTC (rev 2346) +++ trunk/nuiton-profiling/pom.xml 2012-05-02 14:02:15 UTC (rev 2347) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.8</version> + <version>2.4.9-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-05-02 14:02:14 UTC (rev 2346) +++ trunk/nuiton-utils/pom.xml 2012-05-02 14:02:15 UTC (rev 2347) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.8</version> + <version>2.4.9-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-05-02 14:02:14 UTC (rev 2346) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-05-02 14:02:15 UTC (rev 2347) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.8</version> + <version>2.4.9-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-05-02 14:02:14 UTC (rev 2346) +++ trunk/nuiton-validator/pom.xml 2012-05-02 14:02:15 UTC (rev 2347) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.8</version> + <version>2.4.9-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-02 14:02:14 UTC (rev 2346) +++ trunk/pom.xml 2012-05-02 14:02:15 UTC (rev 2347) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.8</version> + <version>2.4.9-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -317,12 +317,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.8 + 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.8 + 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

r2346 - in tags: . nuiton-utils-2.4.8
by maven-release＠users.nuiton.org May 2, 2012

May 2, 2012

Author: maven-release Date: 2012-05-02 16:02:14 +0200 (Wed, 02 May 2012) New Revision: 2346 Url: http://nuiton.org/repositories/revision/nuiton-utils/2346 Log: [maven-release-plugin] copy for tag nuiton-utils-2.4.8 Added: tags/nuiton-utils-2.4.8/ Property changes on: tags/nuiton-utils-2.4.8 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0