- Processor-commits - mailman.cloud.codelutin.com

r308 - trunk
by tchemit＠users.nuiton.org 10 Jan '10

10 Jan '10

Author: tchemit Date: 2010-01-10 22:37:35 +0100 (Sun, 10 Jan 2010) New Revision: 308 Modified: trunk/pom.xml Log: remove default goal (interacts not so good with profiles) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 03:27:09 UTC (rev 307) +++ trunk/pom.xml 2010-01-10 21:37:35 UTC (rev 308) @@ -8,8 +8,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.4</version> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> </parent> <artifactId>processor</artifactId> @@ -266,12 +266,6 @@ </properties> - <build> - - <defaultGoal>install</defaultGoal> - - </build> -

1 0

r307 - trunk
by tchemit＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: tchemit Date: 2010-01-07 04:27:09 +0100 (Thu, 07 Jan 2010) New Revision: 307 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-01 17:28:28 UTC (rev 306) +++ trunk/pom.xml 2010-01-07 03:27:09 UTC (rev 307) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.4-SNAPSHOT</version> + <version>1.1.4</version> </parent> <artifactId>processor</artifactId>

1 0

r306 - trunk/maven-processor-plugin
by tchemit＠users.nuiton.org 01 Jan '10

01 Jan '10

Author: tchemit Date: 2010-01-01 18:28:28 +0100 (Fri, 01 Jan 2010) New Revision: 306 Modified: trunk/maven-processor-plugin/pom.xml Log: use javadoc configuration from mavenpom Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2010-01-01 16:46:56 UTC (rev 305) +++ trunk/maven-processor-plugin/pom.xml 2010-01-01 17:28:28 UTC (rev 306) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -54,7 +56,7 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> </dependency> - + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> @@ -67,7 +69,7 @@  <name>Nuiton Processor :: Maven plugin</name> <inceptionYear>2006</inceptionYear> - +    @@ -93,367 +95,16 @@ </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <taglets> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - </plugins> - - </pluginManagement> - </build>  <reporting> <plugins> + <plugin> <artifactId>maven-plugin-plugin</artifactId> </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <taglets> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - <report>test-javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting>

1 0

r305 - in trunk: . maven-processor-plugin/src/main/java/org/nuiton/processor/plugin maven-processor-plugin/src/site/apt
by tchemit＠users.nuiton.org 01 Jan '10

01 Jan '10

Author: tchemit Date: 2010-01-01 17:46:56 +0100 (Fri, 01 Jan 2010) New Revision: 305 Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java trunk/maven-processor-plugin/src/site/apt/index.apt trunk/pom.xml Log: - use last version of mavenpom and maven-helper-plugin new api - fix doc Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-12-18 13:37:06 UTC (rev 304) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2010-01-01 16:46:56 UTC (rev 305) @@ -30,7 +30,6 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; -import java.io.IOException; import java.util.Arrays; import java.util.Map; import java.util.Map.Entry; @@ -123,29 +122,29 @@ * @parameter expression="${processor.overwrite}" default-value="false" * @since 0.10 */ - private boolean overwrite; + protected boolean overwrite; /** * Permet d'obtenir plus d'information * * @parameter expression="${processor.verbose}" default-value="${maven.verbose}" * @since 0.10 */ - private boolean verbose; + protected boolean verbose; /** * Pour utiliser en phase de test * * @parameter expression="${processor.testPhase}" default-value="false" * @since 1.0.3 */ - private boolean testPhase; + protected boolean testPhase; /** * Les fichiers à traiter */ protected Map<String, String> filesToTreate; - public ProcessorPlugin() { - super("all files are up-to-date."); - } +// public ProcessorPlugin() { +// super("all files are up-to-date."); +// } @Override public boolean isVerbose() { @@ -168,11 +167,13 @@ } @Override - protected boolean init() throws Exception { + protected void init() throws Exception { +// protected boolean init() throws Exception { if (filters.isEmpty()) { - getLog().warn("No filters to use, skip execution."); - return false; + return; +// getLog().warn("No filters to use, skip execution."); +// return false; } MirroredFileUpdater updater = overwrite ? null : new MirroredFileUpdater(fileInPattern, fileOutPattern, srcDir, destDir); @@ -185,16 +186,29 @@ filesToTreate = getFilesToTreate(aIncludes, aExcludes, srcDir, updater); +// return true; + } + + @Override + protected boolean checkSkip() { + if (filters.isEmpty()) { + getLog().warn("No filters to use, skip execution."); + return false; + } + if (filesToTreate==null || filesToTreate.isEmpty()) { + getLog().info("No file to process."); + return false; + } return true; } @Override protected void doAction() throws Exception { - if (filesToTreate.isEmpty()) { - getLog().info("No file to process."); - return; - } +// if (filesToTreate.isEmpty()) { +// getLog().info("No file to process."); +// return; +// } if (isVerbose()) { printConfig(); @@ -214,12 +228,13 @@ getLog().info("Process " + srcFile); } // creation du repertoire pour le fichier destination - if (!dstFile.getParentFile().exists()) { - boolean b = dstFile.getParentFile().mkdirs(); - if (!b) { - throw new IOException("could not create directory " + dstFile); - } - } + createDirectoryIfNecessary(dstFile.getParentFile()); +// if (!dstFile.getParentFile().exists()) { +// boolean b = dstFile.getParentFile().mkdirs(); +// if (!b) { +// throw new IOException("could not create directory " + dstFile); +// } +// } processor.process(new FileReader(srcFile), new FileWriter(dstFile)); } Modified: trunk/maven-processor-plugin/src/site/apt/index.apt =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 13:37:06 UTC (rev 304) +++ trunk/pom.xml 2010-01-01 16:46:56 UTC (rev 305) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>processor</artifactId>

1 0

r304 - trunk
by tchemit＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: tchemit Date: 2009-12-18 14:37:06 +0100 (Fri, 18 Dec 2009) New Revision: 304 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-11 10:56:39 UTC (rev 303) +++ trunk/pom.xml 2009-12-18 13:37:06 UTC (rev 304) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> </parent> <artifactId>processor</artifactId>

1 0

r303 - trunk
by tchemit＠users.nuiton.org 11 Dec '09

11 Dec '09

Author: tchemit Date: 2009-12-11 11:56:39 +0100 (Fri, 11 Dec 2009) New Revision: 303 Modified: trunk/pom.xml Log: - use mavenpom 1.1.2 - use normal directory layout for site - remove ide files Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-10 21:40:35 UTC (rev 302) +++ trunk/pom.xml 2009-12-11 10:56:39 UTC (rev 303) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> </parent> <artifactId>processor</artifactId>

1 0

r302 - in trunk: ant-processor-task/src/site maven-processor-plugin/src/site nuiton-processor/src/site src/site
by tchemit＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: tchemit Date: 2009-12-10 22:40:35 +0100 (Thu, 10 Dec 2009) New Revision: 302 Added: trunk/ant-processor-task/src/site/site_fr.xml trunk/maven-processor-plugin/src/site/site_fr.xml trunk/nuiton-processor/src/site/site_fr.xml trunk/src/site/site_fr.xml Removed: trunk/ant-processor-task/src/site/site.xml trunk/maven-processor-plugin/src/site/site.xml trunk/nuiton-processor/src/site/site.xml trunk/src/site/site.xml Log: - rename site.xml to site_fr.xml to use heritance from mavenpom - use index.html in breadcrumbs Deleted: trunk/ant-processor-task/src/site/site.xml =================================================================== --- trunk/ant-processor-task/src/site/site.xml 2009-12-10 21:36:53 UTC (rev 301) +++ trunk/ant-processor-task/src/site/site.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - <links> - <item name="Nuiton Processor" href="../nuiton-processor"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/ant-processor-task/src/site/site_fr.xml (from rev 299, trunk/ant-processor-task/src/site/site.xml) =================================================================== --- trunk/ant-processor-task/src/site/site_fr.xml (rev 0) +++ trunk/ant-processor-task/src/site/site_fr.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + <links> + <item name="Nuiton Processor" href="../nuiton-processor"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + </menu> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/maven-processor-plugin/src/site/site.xml =================================================================== --- trunk/maven-processor-plugin/src/site/site.xml 2009-12-10 21:36:53 UTC (rev 301) +++ trunk/maven-processor-plugin/src/site/site.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - <links> - <item name="Nuiton Processor" href="../nuiton-processor"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item name="Goals" href="plugin-info.html"> - <item name="process" href="process-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/maven-processor-plugin/src/site/site_fr.xml (from rev 299, trunk/maven-processor-plugin/src/site/site.xml) =================================================================== --- trunk/maven-processor-plugin/src/site/site_fr.xml (rev 0) +++ trunk/maven-processor-plugin/src/site/site_fr.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + <links> + <item name="Nuiton Processor" href="../nuiton-processor"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + <item name="Goals" href="plugin-info.html"> + <item name="process" href="process-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/maven-processor-plugin/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/nuiton-processor/src/site/site.xml =================================================================== --- trunk/nuiton-processor/src/site/site.xml 2009-12-10 21:36:53 UTC (rev 301) +++ trunk/nuiton-processor/src/site/site.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - <links> - <item name="Maven-processor-plugin" href="../maven-processor-plugin/"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item href="/index.html" name="Accueil"/> - - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu name="Developpeur"> - <item name="Todo" href="Todo.html"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/nuiton-processor/src/site/site_fr.xml (from rev 299, trunk/nuiton-processor/src/site/site.xml) =================================================================== --- trunk/nuiton-processor/src/site/site_fr.xml (rev 0) +++ trunk/nuiton-processor/src/site/site_fr.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + <links> + <item name="Maven-processor-plugin" href="../maven-processor-plugin/"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="/index.html" name="Accueil"/> + + </menu> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/processor/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu name="Developpeur"> + <item name="Todo" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/nuiton-processor/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + Added: svn:eol-style + native Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-12-10 21:36:53 UTC (rev 301) +++ trunk/src/site/site.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="modules"/> - - <menu ref="reports"/> - </body> -</project> Copied: trunk/src/site/site_fr.xml (from rev 299, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2009-12-10 21:40:35 UTC (rev 302) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="modules"/> + + <menu ref="reports"/> + </body> +</project>

1 0

r301 - trunk/ant-processor-task
by tchemit＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: tchemit Date: 2009-12-10 22:36:53 +0100 (Thu, 10 Dec 2009) New Revision: 301 Modified: trunk/ant-processor-task/pom.xml Log: - use :: module name notation - add testPhase property in mojo to change test sources root Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2009-12-10 21:36:01 UTC (rev 300) +++ trunk/ant-processor-task/pom.xml 2009-12-10 21:36:53 UTC (rev 301) @@ -42,7 +42,7 @@    - <name>Nuiton processor ant task</name> + <name>Nuiton Processor :: Ant task</name> <inceptionYear>2009</inceptionYear>

1 0

r300 - in trunk: . maven-processor-plugin maven-processor-plugin/src/main/java/org/nuiton/processor/plugin nuiton-processor
by tchemit＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: tchemit Date: 2009-12-10 22:36:01 +0100 (Thu, 10 Dec 2009) New Revision: 300 Modified: trunk/maven-processor-plugin/pom.xml trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java trunk/nuiton-processor/pom.xml trunk/pom.xml Log: - use :: module name notation - add testPhase property in mojo to change test sources root Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2009-12-07 16:43:23 UTC (rev 299) +++ trunk/maven-processor-plugin/pom.xml 2009-12-10 21:36:01 UTC (rev 300) @@ -65,7 +65,7 @@    - <name>Nuiton processor maven plugin</name> + <name>Nuiton Processor :: Maven plugin</name> <inceptionYear>2006</inceptionYear>  Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-12-07 16:43:23 UTC (rev 299) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-12-10 21:36:01 UTC (rev 300) @@ -30,21 +30,21 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; +import java.io.IOException; import java.util.Arrays; import java.util.Map; import java.util.Map.Entry; /** * Maven2 plugin for Nuiton Processor. - * + * * Created: 14 avril 2006 * * @author ruchaud * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - * + * + * Last update: $Date$ + * by : $Author$ * @goal process * @requiresProject true */ @@ -74,32 +74,33 @@ protected File destDir; /** * Fichiers à inclure. - * + * * Il s'agit des expressions séparées par des virgules. - * + * * Exemple : + * + * *.java,*.xml * - * *.java,*.xml - * * @parameter expression="${processor.includes}" * @since 0.10 */ protected String includes; /** * Fichiers à exclure. - * + * * Il s'agit des expressions spérarées par des virgules. - * + * * Exemple : + * + * *.java,*.xml * - * *.java,*.xml - * * @parameter expression="${processor.excludes}" * @since 0.10 */ protected String excludes; /** * ??? + * * @parameter expression="${processor.fileInPattern}" default-value="" * @since 0.10 */ @@ -131,6 +132,13 @@ */ private boolean verbose; /** + * Pour utiliser en phase de test + * + * @parameter expression="${processor.testPhase}" default-value="false" + * @since 1.0.3 + */ + private boolean testPhase; + /** * Les fichiers à traiter */ protected Map<String, String> filesToTreate; @@ -169,7 +177,7 @@ MirroredFileUpdater updater = overwrite ? null : new MirroredFileUpdater(fileInPattern, fileOutPattern, srcDir, destDir); - if (updater!=null) { + if (updater != null) { updater.setDestinationDirectory(destDir); } String[] aIncludes = includes.split(","); @@ -206,7 +214,12 @@ getLog().info("Process " + srcFile); } // creation du repertoire pour le fichier destination - dstFile.getParentFile().mkdirs(); + if (!dstFile.getParentFile().exists()) { + boolean b = dstFile.getParentFile().mkdirs(); + if (!b) { + throw new IOException("could not create directory " + dstFile); + } + } processor.process(new FileReader(srcFile), new FileWriter(dstFile)); } @@ -216,10 +229,19 @@ } // on indique que le repertoire entrant n'est plus dans le build // car sinon on va avoir des classes dupliquées - removeCompileSourceRoots(srcDir); + if (testPhase) { + removeTestCompileSourceRoots(srcDir); + } else { + removeCompileSourceRoots(srcDir); + } + // le repertoire sortant est dans le build de maven - addCompileSourceRoots(destDir); + if (testPhase) { + addTestCompileSourceRoots(destDir); + } else { + addCompileSourceRoots(destDir); + } } protected void printConfig() { Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2009-12-07 16:43:23 UTC (rev 299) +++ trunk/nuiton-processor/pom.xml 2009-12-10 21:36:01 UTC (rev 300) @@ -45,7 +45,7 @@   - <name>Nuiton processor library</name> + <name>Nuiton Processor :: Api</name> <description> Cette librairie permet la création de filtre sur les fichiers sources. </description> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 16:43:23 UTC (rev 299) +++ trunk/pom.xml 2009-12-10 21:36:01 UTC (rev 300) @@ -249,7 +249,7 @@    - <name>Nuiton processor project</name> + <name>Nuiton Processor</name> <description>Efficient Universal Processor</description> <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/processor</url>

1 0

r299 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by fdesbois＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: fdesbois Date: 2009-12-07 17:43:23 +0100 (Mon, 07 Dec 2009) New Revision: 299 Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2009-12-07 16:43:20 UTC (rev 298) +++ trunk/ant-processor-task/pom.xml 2009-12-07 16:43:23 UTC (rev 299) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2009-12-07 16:43:20 UTC (rev 298) +++ trunk/maven-processor-plugin/pom.xml 2009-12-07 16:43:23 UTC (rev 299) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2009-12-07 16:43:20 UTC (rev 298) +++ trunk/nuiton-processor/pom.xml 2009-12-07 16:43:23 UTC (rev 299) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 16:43:20 UTC (rev 298) +++ trunk/pom.xml 2009-12-07 16:43:23 UTC (rev 299) @@ -13,7 +13,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -279,9 +279,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.0.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> </project>

1 0