r1958 - in trunk: . maven-i18n-plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl maven-i18n-plugin/src/site src/site
Author: tchemit Date: 2012-07-09 12:17:13 +0200 (Mon, 09 Jul 2012) New Revision: 1958 Url: http://nuiton.org/repositories/revision/i18n/1958 Log: fixes #2175: Updates to mavenpom 3.3.4 fixes #928: Use maven-plugin-plugin 3 api Modified: trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java trunk/maven-i18n-plugin/src/site/site_en.xml trunk/maven-i18n-plugin/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/pom.xml 2012-07-09 10:17:13 UTC (rev 1958) @@ -94,6 +94,12 @@ <artifactId>maven-plugin-api</artifactId> </dependency> + <!-- dependencies to mojo annotations --> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> + <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -147,10 +153,14 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> <executions> <execution> <goals> <goal>helpmojo</goal> + <goal>descriptor</goal> </goals> </execution> </executions> @@ -175,6 +185,29 @@ <plugins> <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> <artifactId>maven-plugin-plugin</artifactId> <version>${pluginPluginVersion}</version> </plugin> @@ -190,6 +223,34 @@ <version>${plexusPluginVersion}</version> </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadocPluginVersion}</version> + <configuration> + <quiet>true</quiet> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>${pluginPluginVersion}</version> + </tagletArtifact> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.5.5</version> + </tagletArtifact> + </tagletArtifacts> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> </reporting> Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,8 @@ package org.nuiton.i18n.plugin; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.nuiton.i18n.I18nUtil; import org.nuiton.plugin.AbstractPlugin; @@ -55,20 +57,17 @@ /** * Dependance du projet. * - * @parameter default-value="${project}" - * @required * @since 1.0.2 */ + @Component protected MavenProject project; /** * Name to use as prefix of generated files. * <p/> * <b>Note :</b> By default, use the artifact id. - * - * @parameter expression="${i18n.artifactId}" default-value="${project.artifactId}" - * @readonly */ + @Parameter(property = "i18n.artifactId", defaultValue = "${project.artifactId}", readonly = true) protected String artifactId; /** @@ -76,34 +75,20 @@ * <p/> * Example : * <pre>fr_FR,en_GB</pre> - * - * @parameter expression="${i18n.bundles}" default-value="fr_FR,en_GB" - * @required */ + @Parameter(property = "i18n.bundles", defaultValue = "fr_FR,en_GB", required = true) protected String bundles; - /** - * Directory where to find project i18n files. - * - * @parameter expression="${i18n.src}" default-value="${basedir}/src/main/resources/i18n" - * @required - */ + /** Directory where to find project i18n files. */ + @Parameter(property = "i18n.src", defaultValue = "\"${basedir}/src/main/resources/i18n", required = true) protected File src; - /** - * Directory where to generate i18n files. - * - * @parameter expression="${i18n.out}" default-value="${basedir}/target/generated-sources/i18n" - * @required - */ + /** Directory where to generate i18n files. */ + @Parameter(property = "i18n.out", defaultValue = "${basedir}/target/generated-sources/i18n", required = true) protected File out; - /** - * Encoding used to load and store properties. - * - * @parameter expression="${i18n.encoding}" default-value="${project.build.sourceEncoding}" - * @required - */ + /** Encoding used to load and store properties. */ + @Parameter(property = "i18n.encoding", defaultValue = "${project.build.sourceEncoding}", required = true) protected String encoding; /** @@ -111,26 +96,24 @@ * <p/> * <b>Note :</b> By default, this is active, in order to have a project uptodate * with last i18n bundles detected. - * - * @parameter expression="${i18n.genSrc}" default-value="true" */ + @Parameter(property = "i18n.genSrc", defaultValue = "true") protected boolean genSrc; /** * Verbose flag. * <p/> * <b>Note :</b> if not setted, we used the {@code maven.verbose} property. - * - * @parameter expression="${i18n.verbose}" default-value="${maven.verbose}" */ + @Parameter(property = "i18n.verbose", defaultValue = "${maven.verbose}") protected boolean verbose; /** * Silent flag to see only errors in console. * - * @parameter expression="${i18n.silent}" default-value="false" * @since 1.0.0-rc-5 */ + @Parameter(property = "i18n.silent", defaultValue = "false") protected boolean silent; /** @@ -138,9 +121,8 @@ * <p/> * <b>Note :</b> By default not active. Use this with care since it can * delete keys. Moreover if this flag is activated, then all files will be parsed. - * - * @parameter expression="${i18n.strictMode}" default-value="false" */ + @Parameter(property = "i18n.strictMode", defaultValue = "false") protected boolean strictMode; /** locales to process */ Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,10 @@ package org.nuiton.i18n.plugin; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.io.SortedProperties; import java.io.File; @@ -36,19 +40,17 @@ * * @author jruchaud <ruchaud@codelutin.com> * @author chemit <chemit@codelutin.com> - * @goal gen - * @phase generate-resources - * @execute goal=get */ +@Mojo(name = "gen", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) +@Execute(goal = "get") public class GenerateMojo extends AbstractI18nMojo { /** * A flag to check that bundles are complete (no missing i18n translations). * - * @parameter expression="${i18n.checkBundle}" default-value="true" - * @required * @since 1.0.0 */ + @Parameter(property = "i18n.checkBundle", defaultValue = "true", required = true) protected boolean checkBundle; /** @@ -56,28 +58,25 @@ * <p/> * <b>Note :</b> Need the {@link #checkBundle} to be activated). * - * @parameter expression="${i18n.showEmpty}" default-value="false" - * @required * @since 1.0.0 */ + @Parameter(property = "i18n.showEmpty", defaultValue = "false", required = true) protected boolean showEmpty; /** * To keep a backup of old i18n bundles (suffiex by a {@code ~}). * <p/> * <b>Note: </b> By default, this property is not active. - * - * @parameter expression="${i18n.keepBackup}" default-value="false" */ + @Parameter(property = "i18n.keepBackup", defaultValue = "false") protected boolean keepBackup; /** * To keep generated getter files. * <p/> * <b>Note: </b> By default, this property is not active. - * - * @parameter expression="${i18n.keepGetters}" default-value="false" */ + @Parameter(property = "i18n.keepGetters", defaultValue = "false") protected boolean keepGetters; @Override Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,9 @@ package org.nuiton.i18n.plugin; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.util.DirectoryScanner; import org.nuiton.io.SortedProperties; import org.nuiton.plugin.PluginHelper; @@ -37,18 +40,16 @@ * Recupere les différents fichiers des parsers en un fichier de proprietes. * * @author julien - * @goal get - * @phase generate-resources */ +@Mojo(name = "get", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class GetterMojo extends AbstractI18nMojo { /** * To keep generated getter files. * <p/> * <b>Note: </b> By default, this property is not active. - * - * @parameter expression="${i18n.keepGetters}" default-value="false" */ + @Parameter(property = "i18n.keepGetters", defaultValue = "false") protected boolean keepGetters; protected static final String FROM_GETTERS = "-fromGetters"; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,7 @@ package org.nuiton.i18n.plugin.bundle; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.AbstractI18nMojo; import java.io.File; @@ -41,22 +42,19 @@ public abstract class AbstractI18nBundleMojo extends AbstractI18nMojo { /** - * Repertoire ou generer les bundles. + * Directory where to generate bundles. * - * @parameter expression="${i18n.collectOutputDir}" default-value="${basedir}/target/i18n" - * @required * @since 1.0.2 */ + @Parameter(property = "i18n.collectOutputDir", defaultValue = "${basedir}/target/i18n", required = true) protected File collectOutputDir; /** - * Nom de base des fichiers qui contient les localisations des bundles. + * BAse name of file which contains bundles locations. * - * @parameter expression="${i18n.collectOutputName}" - * default-value="collect-${project.artifactId}-i18n" - * @required * @since 1.0.2 */ + @Parameter(property = "i18n.collectOutputName", defaultValue = "collect-${project.artifactId}-i18n", required = true) protected String collectOutputName; /** Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -27,6 +27,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Parameter; import java.io.File; import java.io.IOException; @@ -48,9 +49,9 @@ * <p/> * If not defined, will use the {@link #encoding} parameter. * - * @parameter expression="${i18n.bundleInputEncoding}" * @since 2.4 */ + @Parameter(property = "i18n.bundleInputEncoding") protected String bundleInputEncoding; /** @@ -58,19 +59,18 @@ * <p/> * If not defined, will use the {@link #encoding} parameter. * - * @parameter expression="${i18n.bundleOutputEncoding}" * @since 2.4 */ + @Parameter(property = "i18n.bundleOutputEncoding") protected String bundleOutputEncoding; /** * Root directory where to generate aggregated bundles (this directory will * be added as resources of the project). * - * @parameter expression="${i18n.bundleOutputDir}" default-value="${basedir}/target/generated-sources/resources" - * @required * @since 1.0.0 */ + @Parameter(property = "i18n.bundleOutputDir", defaultValue = "${basedir}/target/generated-sources/resources", required = true) protected File bundleOutputDir; /** @@ -88,28 +88,26 @@ * directory : foo/bar * </pre> * - * @parameter expression="${i18n.bundleOutputPackage}" default-value="META-INF" - * @required * @since 2.3.2 */ + @Parameter(property = "i18n.bundleOutputPackage", defaultValue = "META-INF", required = true) protected String bundleOutputPackage; /** * Name of the bundle to generate. * - * @parameter expression="${i18n.bundleOutputName}" default-value="${project.artifactId}-i18n" - * @required * @since 1.0.2 */ + @Parameter(property = "i18n.bundleOutputName", defaultValue = "${project.artifactId}-i18n", required = true) protected String bundleOutputName; /** * A flag to generate a bundle with the first locale defined as a default * bundle (with no locale specialization). * - * @parameter expression="${i18n.generateDefaultLocale}" default-value="false" * @since 2.1 */ + @Parameter(property = "i18n.generateDefaultLocale", defaultValue = "false") protected boolean generateDefaultLocale; /** @@ -117,9 +115,9 @@ * <p/> * <b>Note :</b> This behaviour will be activated is {@link #failsIfWarning} is on. * - * @parameter expression="${i18n.checkBundle}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "i18n.checkBundle", defaultValue = "true") protected boolean checkBundle; /** @@ -127,9 +125,9 @@ * <p/> * <b>Note :</b> Need the {@link #checkBundle} to be activated). * - * @parameter expression="${i18n.showEmpty}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "i18n.showEmpty", defaultValue = "false") protected boolean showEmpty; /** @@ -139,9 +137,9 @@ * <b>Note :</b> This parameter should be used in a release profile to * ensure bundles are complete. * - * @parameter expression="${i18n.failsIfWarning}" default-value="false" * @since 2.0 */ + @Parameter(property = "i18n.failsIfWarning", defaultValue = "false") protected boolean failsIfWarning; /** to keep all none translated i18n keys by locale. */ Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -24,6 +24,9 @@ */ package org.nuiton.i18n.plugin.bundle; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.plugin.AbstractAvailableDataMojo; import java.util.Arrays; @@ -37,19 +40,20 @@ * * @author fdesbois <desbois@codelutin.com> * $Id$ - * @goal available-converters - * @requiresProject true - * @requiresDirectInvocation true - * @requiresDependencyResolution test * @since 2.4 */ +@Mojo(name = "available-converters", + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.TEST) public class AvailableConverterMojo extends AbstractAvailableDataMojo { /** * Map of all availables {@link BundleFormatConverter}. * - * @component role="org.nuiton.i18n.plugin.bundle.BundleFormatConverter" + * @since 2.4 */ + @Component(role = BundleFormatConverter.class) protected Map<String, BundleFormatConverter> bundleFormatConverters; @Override Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -27,6 +27,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.i18n.bundle.I18nBundleEntry; import org.nuiton.i18n.bundle.I18nBundleUtil; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -61,13 +67,13 @@ * This goal permits this using the dependencies graph order of artifacts. * * @author tchemit <chemit@codelutin.com> - * @goal bundle - * @phase generate-resources - * @execute goal=collect-i18n-artifacts - * @requiresProject true - * @requiresDependencyResolution runtime * @since 0.12 */ +@Mojo(name = "bundle", + defaultPhase = LifecyclePhase.GENERATE_RESOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.RUNTIME) +@Execute(goal = "collect-i18n-artifacts") public class BundleMojo extends AbstractMakeI18nBundleMojo { /** @@ -76,25 +82,25 @@ * This file contains all generated bundles and the paths of all i18n * artifacts used to make it. * - * @parameter expression="${i18n.generateDefinitionFile}" default-value="true" * @since 2.0 */ + @Parameter(property = "i18n.generateDefinitionFile", defaultValue = "true") protected boolean generateDefinitionFile; /** * Converter used to change format of bundles. * - * @parameter expression="${i18n.bundleFormatConverter}" * @since 2.4 */ + @Parameter(property = "i18n.bundleFormatConverter") protected String bundleFormatConverter; /** * Map of all availables {@link BundleFormatConverter}. * - * @component role="org.nuiton.i18n.plugin.bundle.BundleFormatConverter" * @since 2.4 */ + @Component(role = BundleFormatConverter.class) protected Map<String, BundleFormatConverter> bundleFormatConverters; /** Format converter to apply if */ Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -32,6 +32,11 @@ import org.apache.maven.artifact.resolver.ArtifactCollector; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.shared.dependency.tree.DependencyNode; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; @@ -55,54 +60,52 @@ * aggregated bundle. * * @author tchemit <chemit@codelutin.com> - * @goal collect-i18n-artifacts - * @phase generate-resources - * @requiresProject true - * @requiresDependencyResolution runtime * @since 1.0.2 */ +@Mojo(name = "collect-i18n-artifacts", + defaultPhase = LifecyclePhase.GENERATE_RESOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.RUNTIME) public class CollectI18nArtifactsMojo extends AbstractI18nBundleMojo { /** * Local Repository. * - * @parameter expression="${localRepository}" - * @required - * @readonly * @since 1.0.2 */ + @Parameter(property = "localRepository", required = true, readonly = true) protected ArtifactRepository localRepository; /** * Dependency tree builder component. * - * @component * @since 1.0.2 */ + @Component protected DependencyTreeBuilder dependencyTreeBuilder; /** * Artifact Factory component. * - * @component * @since 1.0.2 */ + @Component protected ArtifactFactory factory; /** * Artifact metadata source component. * - * @component * @since 1.0.2 */ + @Component protected ArtifactMetadataSource artifactMetadataSource; /** * Artifact collector component. * - * @component * @since 1.0.2 */ + @Component protected ArtifactCollector collector; I18nArtifact[] i18nArtifacts; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,7 @@ package org.nuiton.i18n.plugin.parser; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.AbstractI18nMojo; import org.nuiton.io.FileUpdater; import org.nuiton.io.SortedProperties; @@ -65,25 +66,16 @@ */ public abstract FileUpdater newFileUpdater(SourceEntry entry); - /** - * Build directory (used to know if files in sources are up-to-date). - * - * @parameter expression="${i18n.cp}" default-value="${basedir}/target/classes" - */ + /** Build directory (used to know if files in sources are up-to-date). */ + @Parameter(property = "i18n.cp", defaultValue = "${basedir}/target/classes") protected File cp; - /** - * To treate default entry offered by the mojo. - * - * @parameter expression="${i18n.treateDefaultEntry}" default-value="true" - */ + /** To treat default entry offered by the mojo. */ + @Parameter(property = "i18n.treateDefaultEntry", defaultValue = "true") protected boolean treateDefaultEntry; - /** - * Source entries (src+includes+excludes) to process. - * - * @parameter expression="${i18n.entries}" - */ + /** Source entries (src+includes+excludes) to process. */ + @Parameter(property = "i18n.entries") protected I18nSourceEntry[] entries; /** @@ -92,9 +84,9 @@ * Note: the value will be always {@code true} if {@link #verbose} is * set at {@code true}. * - * @parameter expression="${i18n.showTouchedFiles}" default-value="${maven.verbose}" * @since 0.9 */ + @Parameter(property = "i18n.showTouchedFiles", defaultValue = "${maven.verbose}") protected boolean showTouchedFiles; /** @@ -103,17 +95,17 @@ * Note: by default, do not perform backup (but it was here originaly so let * it possible...) * - * @parameter expression="${i18n.backupGetter}" default-value="false" * @since 1.0.2 */ + @Parameter(property = "i18n.backupGetter", defaultValue = "false") protected boolean backupGetter; /** * To force reparse of all sources. * - * @parameter expression="${i18n.force}" default-value="false" * @since 1.2 */ + @Parameter(property = "i18n.force", defaultValue = "false") protected boolean force; private SortedProperties result; @@ -229,8 +221,7 @@ entry.getFoudFiles() + " files)"); } - for (int i = 0, max = files.length; i < max; i++) { - String file1 = files[i]; + for (String file1 : files) { String fileName = entry.getBasedir().getAbsolutePath() + File.separator + file1; File file = new File(fileName); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -28,6 +28,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.parser.AbstractFileParser; import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; import org.nuiton.i18n.plugin.parser.FileParser; @@ -86,9 +87,9 @@ * <b>Note : </b> If the {@code coreRulesFile} is not defined, then you must * fill this parameter. * - * @parameter * @since 2.0 */ + @Parameter protected String[] userRulesFiles; /** @@ -101,9 +102,9 @@ * </namespaces> * </pre> * - * @parameter * @since 2.0 */ + @Parameter protected Map<String, String> namespaces; protected abstract String getCoreRuleFile(); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,9 @@ package org.nuiton.i18n.plugin.parser.impl; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.parser.AbstractFileParser; import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; import org.nuiton.i18n.plugin.parser.FileParser; @@ -55,41 +58,39 @@ * phase, otherwise all files will be considered as uptodate. * * @author tchemit <chemit@codelutin.com> - * @goal parserGWTJava - * @phase generate-resources * @since 2.1 */ +@Mojo(name = "parserGWTJava", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserGWTJavaMojo extends AbstractI18nParserMojo { - /** - * Root directory of the default entry. - * - * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/main/java" - */ + /** Root directory of the default entry. */ + @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/java") protected File defaultBasedir; /** * Default included files to process (ant-like expression). - * - * @parameter expression="${i18n.defaultIncludes}" default-value="**\/*.java" + * <p/> + * <strong>Note:</strong> default value is **\/*.java */ - protected String defaultIncludes; +// @Parameter(property = "i18n.defaultIncludes", defaultValue = "**\\/*.java", required = true) + @Parameter(property = "i18n.defaultIncludes") + protected String defaultIncludes = "**\\/*.java"; /** * Defines the file name of the getter where to put detected i18n keys * while getter phase. * - * @parameter expression="${i18n.outputGetter}" default-value="gwt-java.getter" * @since 2.0 */ + @Parameter(property = "i18n.outputGetter", defaultValue = "gwt-java.getter") protected String outputGetter; /** * Where to generated temporary processed files. * - * @parameter expression="${i18n.workdir}" default-value="${basedir}/target/i18n-workdir" * @since 2.0 */ + @Parameter(property = "i18n.workdir", defaultValue = "${basedir}/target/i18n-workdir") protected File workdir; protected MirroredFileUpdater entryUpdater; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -26,6 +26,9 @@ package org.nuiton.i18n.plugin.parser.impl; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.parser.AbstractFileParser; import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; import org.nuiton.i18n.plugin.parser.FileParser; @@ -52,32 +55,30 @@ * * @author jruchaud <ruchaud@codelutin.com> * @author tchemit <tchemit@codelutin.com> - * @goal parserJava - * @phase generate-resources */ +@Mojo(name = "parserJava", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserJavaMojo extends AbstractI18nParserMojo { - /** - * Root directory of the default entry. - * - * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/main/java" - */ + /** Root directory of the default entry. */ + @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/java") protected File defaultBasedir; /** * Default included files to process (ant-like expression). - * - * @parameter expression="${i18n.defaultIncludes}" default-value="**\/*.java" + * <p/> + * <strong>Note:</strong> default value is **\/*.java */ - protected String defaultIncludes; +// @Parameter(property = "i18n.defaultIncludes", defaultValue = "**\\/*.java", required = true) + @Parameter(property = "i18n.defaultIncludes") + protected String defaultIncludes = "**\\/*.java"; /** * Defines the file name of the getter where to put detected i18n keys * while getter phase. * - * @parameter expression="${i18n.outputGetter}" default-value="java.getter" * @since 2.0 */ + @Parameter(property = "i18n.outputGetter", defaultValue = "java.getter") protected String outputGetter; @Override Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -26,6 +26,9 @@ package org.nuiton.i18n.plugin.parser.impl; import org.apache.commons.lang.StringUtils; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.parser.I18nSourceEntry; import org.nuiton.i18n.plugin.parser.SourceEntry; import org.nuiton.io.FileUpdater; @@ -47,26 +50,29 @@ * phase, otherwise all files will be considered as uptodate. * * @author tchemit <chemit@codelutin.com> - * @goal parserJsp - * @phase generate-resources * @since 2.0 */ +@Mojo(name = "parserJsp", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserJspMojo extends AbstractParserXmlMojo { /** * Root directory of the default entry. * - * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/main/webapp" - * @required + * @since 2.0 */ + @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/webapp", required = true) protected File defaultBasedir; /** * Default included files to process (ant-like expression). + * <p/> + * <strong>Note:</strong> default value is **\/**.jsp * - * @parameter expression="${i18n.defaultIncludes}" default-value="**\/**.jsp" + * @since 2.0 */ - protected String defaultIncludes; +// @Parameter(property = "i18n.defaultIncludes", defaultValue = "**\\/**.jsp", required = true) + @Parameter(property = "i18n.defaultIncludes") + protected String defaultIncludes = "**\\/**.jsp"; /** * Defines the core rules file used to detect i18n keys in jsp files. @@ -74,26 +80,26 @@ * <b>Note :</b> If you do not want to use it, set it to empty and fill the * {@link #userRulesFiles} parameter. * - * @parameter expression="${i18n.coreRuleFile}" * @since 2.0 */ + @Parameter(property = "i18n.coreRuleFile") protected String coreRuleFile; /** * Defines the file name of the getter where to put detected i18n keys * while getter phase. * - * @parameter expression="${i18n.outputGetter}" default-value="jsp.getter" * @since 2.0 */ + @Parameter(property = "i18n.outputGetter", defaultValue = "jsp.getter", required = true) protected String outputGetter; /** * Where to generated temporary processed files. * - * @parameter expression="${i18n.workdir}" default-value="${basedir}/target/i18n-workdir" * @since 2.0 */ + @Parameter(property = "i18n.workdir", defaultValue = "${basedir}/target/i18n-workdir", required = true) protected File workdir; @Override Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,9 @@ package org.nuiton.i18n.plugin.parser.impl; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.parser.AbstractFileParser; import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; import org.nuiton.i18n.plugin.parser.FileParser; @@ -53,41 +56,45 @@ * phase, otherwise all files will be considered as uptodate. * * @author tchemit <chemit@codelutin.com> - * @goal parserTapestry - * @phase generate-resources * @since 2.1 */ +@Mojo(name = "parserTapestry", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserTapestryMojo extends AbstractI18nParserMojo { /** * Root directory of the default entry. * - * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/main/webapp" + * @since 2.1 */ + @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/webapp", required = true) protected File defaultBasedir; /** * Default included files to process (ant-like expression). * - * @parameter expression="${i18n.defaultIncludes}" default-value="**\/*.tml" + * <strong>Note:</strong> default value is **\/*.tml + * + * @since 2.1 */ - protected String defaultIncludes; +// @Parameter(property = "i18n.defaultIncludes", defaultValue = "**\\/*.tml", required = true) + @Parameter(property = "i18n.defaultIncludes") + protected String defaultIncludes ="**\\/*.tml"; /** * Defines the file name of the getter where to put detected i18n keys * while getter phase. * - * @parameter expression="${i18n.outputGetter}" default-value="tapestry.getter" - * @since 2.0 + * @since 2.1 */ + @Parameter(property = "i18n.outputGetter", defaultValue = "tapestry.getter", required = true) protected String outputGetter; /** * Where to generated temporary processed files. * - * @parameter expression="${i18n.workdir}" default-value="${basedir}/target/i18n-workdir" - * @since 2.0 + * @since 2.1 */ + @Parameter(property = "i18n.workdir", defaultValue = "${basedir}/target/i18n-workdir") protected File workdir; protected MirroredFileUpdater entryUpdater; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -25,6 +25,9 @@ package org.nuiton.i18n.plugin.parser.impl; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.parser.I18nSourceEntry; import org.nuiton.i18n.plugin.parser.SourceEntry; import org.nuiton.io.FileUpdater; @@ -47,27 +50,23 @@ * phase, otherwise all files will be considered as uptodate. * * @author tchemit <chemit@codelutin.com> - * @goal parserValidation - * @phase generate-resources */ +@Mojo(name = "parserValidation", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserValidationMojo extends AbstractParserXmlMojo { final URL xworksResource = getClass().getResource("/xwork-validator-1.0.2.dtd"); - /** - * Root directory of the default entry. - * - * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/main/resources" - * @required - */ + /** Root directory of the default entry. */ + @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/resources", required = true) protected File defaultBasedir; - /** - * Default included files to process (ant-like expression). + /** Default included files to process (ant-like expression). * - * @parameter expression="${i18n.defaultIncludes}" default-value="**\/**-validation.xml" - */ - protected String defaultIncludes; + * <strong>Note:</strong> default value is **\/**-validation.xml + * */ +// @Parameter(property = "i18n.defaultIncludes", defaultValue = "**\\/**-validation.xml", required = true) + @Parameter(property = "i18n.defaultIncludes") + protected String defaultIncludes ="**\\/**-validation.xml"; /** * Defines the core rules file used to detect i18n keys in xml validation @@ -76,26 +75,26 @@ * <b>Note :</b> If you do not want to use it, set it to empty and fill the * {@link #userRulesFiles} parameter. * - * @parameter expression="${i18n.coreRuleFile}" default-value="validation.rules" * @since 2.0 */ + @Parameter(property = "i18n.coreRuleFile", defaultValue = "validation.rules", required = true) protected String coreRuleFile; /** * Always use the local xowrks dtd to increase performance. * - * @parameter expression="${i18n.useLocalResolver}" default-value="true" * @since 1.6.0 */ + @Parameter(property = "i18n.useLocalResolver", defaultValue = "true") protected boolean useLocalResolver; /** * Defines the file name of the getter where to put detected i18n keys * while getter phase. * - * @parameter expression="${i18n.outputGetter}" default-value="validation.getter" * @since 2.0 */ + @Parameter(property = "i18n.outputGetter", defaultValue = "validation.getter", required = true) protected String outputGetter; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2012-07-09 10:17:13 UTC (rev 1958) @@ -24,6 +24,9 @@ */ package org.nuiton.i18n.plugin.parser.impl; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.parser.I18nSourceEntry; import org.nuiton.i18n.plugin.parser.SourceEntry; import org.nuiton.io.FileUpdater; @@ -42,45 +45,42 @@ * uptodate. * * @author tchemit <chemit@codelutin.com> - * @goal parserXml - * @phase generate-resources * @since 2.0 */ +@Mojo(name = "parserXml", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserXmlUserMojo extends AbstractParserXmlMojo { /** * Default directory where to look for files. * - * @parameter expression="${i18n.xmlBasedir}" default-value="${basedir}/src/main/resources" - * @required * @since 2.0 */ + @Parameter(property = "i18n.xmlBasedir", defaultValue = "${basedir}/src/main/resources", required = true) protected File basedir; /** * Defines files to parse. * - * @parameter expression="${i18n.xmlIncludes}" - * @required * @since 2.0 */ + @Parameter(property = "i18n.xmlIncludes", required = true) protected String includes; /** * Defines an optional files which contain xpath rules to obtain i18n * keys in xml files and is defined in plugin. * - * @parameter expression="${i18n.coreRuleFiles}" * @since 2.0 */ + @Parameter(property = "i18n.coreRuleFiles") protected String coreRuleFile; /** * Defines the file name of the getter where to put detected i18n keys while getter phase. * - * @parameter expression="${i18n.outputGetter}" default-value="xmlUser.getter" * @since 2.0 */ + @Parameter(property = "i18n.outputGetter", defaultValue = "xmlUser.getter", required = true) protected String outputGetter; @Override Modified: trunk/maven-i18n-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-i18n-plugin/src/site/site_en.xml 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/site/site_en.xml 2012-07-09 10:17:13 UTC (rev 1958) @@ -123,7 +123,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/maven-i18n-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-i18n-plugin/src/site/site_fr.xml 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/maven-i18n-plugin/src/site/site_fr.xml 2012-07-09 10:17:13 UTC (rev 1958) @@ -121,7 +121,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/pom.xml 2012-07-09 10:17:13 UTC (rev 1958) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.2</version> + <version>3.3.4</version> </parent> <artifactId>i18n</artifactId> @@ -150,6 +150,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>compile</scope> + </dependency> + <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -221,6 +228,7 @@ <id>extra-modules</id> <modules> + <module>nuiton-i18n-editor</module> <module>ant-i18n-task</module> </modules> </profile> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/src/site/site_en.xml 2012-07-09 10:17:13 UTC (rev 1958) @@ -114,7 +114,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-30 14:03:24 UTC (rev 1957) +++ trunk/src/site/site_fr.xml 2012-07-09 10:17:13 UTC (rev 1958) @@ -110,7 +110,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'
participants (1)
-
tchemit＠users.nuiton.org