Author: tchemit Date: 2011-02-03 15:09:30 +0100 (Thu, 03 Feb 2011) New Revision: 382 Url: http://nuiton.org/repositories/revision/processor/382 Log: Anomalie #1286: Remove hardcoded plugin declaration compiler plugin in processor Evolution #1288: Updates m-helper-p to 1.2.11 (to be full jdk1.5 compiliant) Modified: trunk/ant-processor-task/pom.xml trunk/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 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 Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-02-03 13:12:44 UTC (rev 381) +++ trunk/ant-processor-task/pom.xml 2011-02-03 14:09:30 UTC (rev 382) @@ -52,6 +52,11 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java =================================================================== --- trunk/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2011-02-03 13:12:44 UTC (rev 381) +++ trunk/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2011-02-03 14:09:30 UTC (rev 382) @@ -25,6 +25,7 @@ package org.nuiton.processor.ant; +import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -99,7 +100,7 @@ "Could nto instanciate processor for reason : " + ex.getMessage(), ex); } - if (encoding == null || encoding.trim().isEmpty()) { + if (StringUtils.isEmpty(encoding)) { setEncoding(ProcessorUtil.DEFAULT_ENCODING); log("Using default system encoding " + encoding); } Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-02-03 13:12:44 UTC (rev 381) +++ trunk/maven-processor-plugin/pom.xml 2011-02-03 14:09:30 UTC (rev 382) @@ -51,6 +51,11 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> </dependency> 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 2011-02-03 13:12:44 UTC (rev 381) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2011-02-03 14:09:30 UTC (rev 382) @@ -25,6 +25,7 @@ package org.nuiton.processor.plugin; +import org.apache.commons.lang.StringUtils; import org.apache.maven.project.MavenProject; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.plugin.AbstractPlugin; @@ -61,6 +62,7 @@ * @since 1.0.0 */ protected MavenProject project; + /** * Répertoire source * @@ -68,6 +70,7 @@ * @since 0.10 */ protected File srcDir; + /** * Répertoire cible * @@ -75,6 +78,7 @@ * @since 0.10 */ protected File destDir; + /** * Fichiers à inclure. * <p/> @@ -88,6 +92,7 @@ * @since 0.10 */ protected String includes; + /** * Fichiers à exclure. * <p/> @@ -101,6 +106,7 @@ * @since 0.10 */ protected String excludes; + /** * ??? * @@ -108,11 +114,13 @@ * @since 0.10 */ protected String fileInPattern = ""; + /** * @parameter expression="${processor.fileOutPattern}" default-value="" * @since 0.10 */ protected String fileOutPattern = ""; + /** * Les filtres a utiliser par le processor, séparés par des virgules * @@ -120,6 +128,7 @@ * @since 0.10 */ protected String filters; + /** * Encoding used to read and writes files. * <p/> @@ -131,6 +140,7 @@ * @since 1.0.4 */ private String encoding; + /** * Ecrase les fichiers générés * @@ -138,6 +148,7 @@ * @since 0.10 */ protected boolean overwrite; + /** * Permet d'obtenir plus d'information * @@ -145,6 +156,7 @@ * @since 0.10 */ protected boolean verbose; + /** * Pour utiliser en phase de test * @@ -152,37 +164,30 @@ * @since 1.0.3 */ protected boolean testPhase; - /** - * Les fichiers à traiter - */ + + /** Les fichiers à traiter */ protected Map<String, String> filesToTreate; - @Override public boolean isVerbose() { return verbose; } - @Override public void setVerbose(boolean verbose) { this.verbose = verbose; } - @Override public MavenProject getProject() { return project; } - @Override public void setProject(MavenProject project) { this.project = project; } - @Override public final String getEncoding() { return encoding; } - @Override public final void setEncoding(String encoding) { this.encoding = encoding; } @@ -190,16 +195,16 @@ @Override protected void init() throws Exception { - if (filters.isEmpty()) { + if (StringUtils.isEmpty(filters)) { return; } - MirroredFileUpdater updater =overwrite ? null : - new MirroredFileUpdater(fileInPattern, - fileOutPattern, - srcDir, - destDir - ); + MirroredFileUpdater updater = overwrite ? null : + new MirroredFileUpdater(fileInPattern, + fileOutPattern, + srcDir, + destDir + ); if (updater != null) { updater.setDestinationDirectory(destDir); @@ -212,11 +217,11 @@ @Override protected boolean checkSkip() { - if (filters.isEmpty()) { + if (StringUtils.isEmpty(filters)) { getLog().warn("No filters to use, skip execution."); return false; } - if (filesToTreate==null || filesToTreate.isEmpty()) { + if (filesToTreate == null || filesToTreate.isEmpty()) { getLog().info("No file to process."); return false; } @@ -279,10 +284,10 @@ if (excludes != null) { getLog().info("config - excludes " + excludes); } - if (!fileInPattern.isEmpty()) { + if (!StringUtils.isEmpty(fileInPattern)) { getLog().info("config - fileInPattern " + fileInPattern); } - if (!fileOutPattern.isEmpty()) { + if (!StringUtils.isEmpty(fileOutPattern)) { getLog().info("config - fileOutPattern " + fileOutPattern); } if (overwrite) { Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-02-03 13:12:44 UTC (rev 381) +++ trunk/nuiton-processor/pom.xml 2011-02-03 14:09:30 UTC (rev 382) @@ -86,9 +86,6 @@ <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - <!-- Stay on jdk5 (requirement for some other project using this library) --> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.target>1.5</maven.compiler.target> </properties> <!-- ************************************************************* --> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 13:12:44 UTC (rev 381) +++ trunk/pom.xml 2011-02-03 14:09:30 UTC (rev 382) @@ -245,7 +245,14 @@ <properties> <!-- pour un multi module on doit fixer le projectId --> <projectId>processor</projectId> - + + <helperPluginVersion>1.2.11-SNAPSHOT</helperPluginVersion> + + <!-- Stay on jdk5 (requirement for some other project using this + library) --> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> + </properties> <!-- ************************************************************* -->