Author: thimel Date: 2008-09-22 13:32:22 +0000 (Mon, 22 Sep 2008) New Revision: 124 Modified: trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java Log: Modified plugin to adopt a maven2 behaviour Modified: trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2008-09-22 12:33:18 UTC (rev 123) +++ trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2008-09-22 13:32:22 UTC (rev 124) @@ -56,16 +56,14 @@ /** * Répertoire source * - * @parameter - * @required + * @parameter expression="${processor.srcDir}" default-value="${basedir}/src/main/java" */ protected File srcDir; /** * Répertoire cible * - * @parameter - * @required + * @parameter expression="${processor.destDir}" default-value="${basedir}/target/processed-sources/java" */ protected File destDir; @@ -124,22 +122,27 @@ getLog().info("Génération des fichiers à partir de lutin processor"); /* Création d'un projet ant */ - Project project = new Project(); + Project antProject = new Project(); BuildLogger logger = new NoBannerLogger(); logger.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); logger.setOutputPrintStream(System.out); logger.setErrorPrintStream(System.err); - project.init(); - project.getBaseDir(); - project.addBuildListener(logger); + antProject.init(); + antProject.getBaseDir(); + antProject.addBuildListener(logger); /* Création de la tâche ant ProcessorTask */ ProcessorTask processor = new ProcessorTask(); - processor.setProject(project); + processor.setProject(antProject); processor.setTaskName("Processor"); + if (verbose) { + getLog().info("srcDir is " + srcDir); + getLog().info("destDir is " + destDir); + } + /* Configuration */ processor.setVerbose(verbose); processor.setSrcdir(srcDir); @@ -169,7 +172,16 @@ * de compilation du projet Maven. */ protected void fixCompileSourceRoots() { + if (project.getCompileSourceRoots().contains(srcDir.getPath())) { + if (verbose) { + getLog().info("srcDir found in compileSourceRoots, removing"); + } + project.getCompileSourceRoots().remove(srcDir.getPath()); + } if (!project.getCompileSourceRoots().contains(destDir.getPath())) { + if (verbose) { + getLog().info("destDir not found in compileSourceRoots, adding"); + } project.addCompileSourceRoot(destDir.getPath()); } }