Author: tchemit Date: 2009-08-29 18:26:44 +0200 (Sat, 29 Aug 2009) New Revision: 267 Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java Log: add comment + remove commented obsolete code Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2009-08-29 15:50:38 UTC (rev 266) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2009-08-29 16:26:44 UTC (rev 267) @@ -33,14 +33,15 @@ * Tache ant pour lutinprocessor. * * To use this task, put this code in ant build file: - * + * <pre> * <taskdef name="processor" classname="org.nuiton.processor.ant.ProcessorTask" * classpath="lib/lutinprocessor.jar" /> + * </pre> * * and use it with: - * + * <pre> * <processor srcdir="${src}" destdir="${targetgen}" filters="org.nuiton.processor.filters.GeneratorTemplatesFilter" /> - * + * </pre> * Created: 14 janv. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> Copyright Code Lutin @@ -183,13 +184,13 @@ // Obtain this list of files within the source directory DirectoryScanner ds = getDirectoryScanner(srcDir); - String[] includes = getIncludes(); - if (includes.length > 0) { - ds.setIncludes(includes); + String[] in = getIncludes(); + if (in.length > 0) { + ds.setIncludes(in); } - String[] excludes = getExcludes(); - if (excludes.length > 0) { - ds.setExcludes(excludes); + String[] ex = getExcludes(); + if (ex.length > 0) { + ds.setExcludes(ex); } ds.scan(); 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-08-29 15:50:38 UTC (rev 266) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-08-29 16:26:44 UTC (rev 267) @@ -123,16 +123,7 @@ * @since 0.10 */ private boolean verbose; -// /** -// * Flag pour indiquer si on doit ajouter le repertoire de generation dans les répertoires -// * de compilation du project Maven Nom par défaut du paquetage généré -// * <p/> -// * TODO Ce flag doit disparaitre dans la prochaine release (uniquement utilisée pour compatibilité) -// * -// * @parameter expression="${processor.addCompileDirectory}" default-value="false" -// * @since 0.16 -// */ -// protected boolean addCompileDirectory; + protected Map<String, String> filesToTreate; public ProcessorPlugin() { @@ -201,74 +192,12 @@ processor.process(new FileReader(srcFile), new FileWriter(dstFile)); } + // on indique que le repertoire entrant n'est plus dans le build + // car sinon on va avoir des classes dupliquées removeCompileSourceRoots(srcDir); + + // le repertoire sortant est dans le build de maven addCompileSourceRoots(destDir); } -// @Override -// public void execute() throws MojoExecutionException { -// getLog().info("Génération des fichiers à partir de lutin processor"); -// -// /* Création d'un projet ant */ -// 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); -// -// antProject.init(); -// antProject.getBaseDir(); -// antProject.addBuildListener(logger); -// -// /* Création de la tâche ant ProcessorTask */ -// ProcessorTask processor = new ProcessorTask(); -// 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); -// destDir.mkdirs(); -// processor.setDestdir(destDir); -// -// processor.setFileInPattern(fileInPattern); -// processor.setFileOutPattern(fileOutPattern); -// -// processor.setIncludes(includes); -// processor.setExcludes(excludes); -// -// processor.setFilters(filters); -// -// processor.setOverwrite(overwrite); -// -// /* Execution */ -// processor.execute(); -// -// if (addCompileDirectory) { -// fixCompileSourceRoots(); -// } -// } -// /** -// * permet d'ajout le répertoire de génération des fichiers java dans les répertoires -// * de compilation du projet Maven. -// */ -// protected void fixCompileSourceRoots() { -// if (project.getCompileSourceRoots().contains(srcDir.getPath())) { -// if (verbose) { -// getLog().info("srcDir found in compileSourceRoots, removing : " + srcDir.getPath()); -// } -// project.getCompileSourceRoots().remove(srcDir.getPath()); -// } -// if (!project.getCompileSourceRoots().contains(destDir.getPath())) { -// if (verbose) { -// getLog().info("destDir not found in compileSourceRoots, adding : " + destDir.getPath()); -// } -// project.addCompileSourceRoot(destDir.getPath()); -// } -// } + }