Author: tchemit Date: 2011-02-03 14:12:44 +0100 (Thu, 03 Feb 2011) New Revision: 381 Url: http://nuiton.org/repositories/revision/processor/381 Log: Anomalie #1286: Remove hardcoded plugin declaration compiler plugin in processor Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/ant-processor-task/pom.xml 2011-02-03 13:12:44 UTC (rev 381) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/maven-processor-plugin/pom.xml 2011-02-03 13:12:44 UTC (rev 381) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/nuiton-processor/pom.xml 2011-02-03 13:12:44 UTC (rev 381) @@ -24,7 +24,9 @@ #L% --> -<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> @@ -35,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> @@ -83,6 +85,10 @@ <properties> <!-- 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> <!-- ************************************************************* --> @@ -90,17 +96,7 @@ <!-- ************************************************************* --> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> + <testResources> <testResource> <directory>src/test/resources</directory> @@ -111,6 +107,7 @@ </testResource> </testResources> </build> + <!-- perform only on a release stage when using the maven-release-plugin --> <profiles> <profile> Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2011-02-03 13:12:44 UTC (rev 381) @@ -40,7 +40,6 @@ import org.nuiton.processor.filters.GeneratorTemplatesFilter; -import java.io.Console; import java.io.IOException; public class GeneratorTemplatesProcessor extends Processor { @@ -64,11 +63,8 @@ } public static void main(String[] args) throws IOException { - String eol = System.getProperty("line.separator"); - Console console = System.console(); if (args.length < 2) { - console.printf("Give source and destination file" + eol); - System.exit(1); + System.out.println("Give source and destination file"); } else { process(args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2011-02-03 13:12:44 UTC (rev 381) @@ -42,8 +42,6 @@ import org.nuiton.processor.filters.ActiveLogsCodeFilter; import org.nuiton.processor.filters.RemoveLogsCodeFilter; -import java.io.Console; - /* * This class is a processor for source logs */ @@ -77,26 +75,24 @@ } public static void main(String[] args) throws Exception { - Console console = System.console(); - String eol = System.getProperty("line.separator"); if (args.length < 2) { - console.printf("Give source and destination file, then action" + eol); - console.printf("Action may be remove or active (default is no action)" + eol); + System.out.println("Give source and destination file, then action"); + System.out.println("Action may be remove or active (default is no action)"); return; } Action action = Action.NoAction; if (args.length > 2) { if (args[2].equals(REMOVE_ACTION)) { action = Action.NoLogsCode; - console.printf("Removing logs code" + eol); + System.out.println("Removing logs code"); } else if (args[2].equals(ACTIVE_ACTION)) { action = Action.Logs; - console.printf("Setting logs active" + eol); + System.out.println("Setting logs active"); } } if (action == Action.NoAction) { - console.printf("No action taken" + eol); + System.out.println("No action taken"); } LogsProcessor processor = new LogsProcessor(action); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2011-02-03 13:12:44 UTC (rev 381) @@ -41,7 +41,6 @@ import org.nuiton.processor.filters.OptimisationFilter; -import java.io.Console; import java.io.IOException; public class OptimisationProcessor extends Processor { // OptimisationProcessor @@ -63,13 +62,11 @@ } public static void main(String[] args) throws IOException { - String eol = System.getProperty("line.separator"); - Console console = System.console(); int length = args.length; switch (length) { case 0: case 1: - console.printf("Give source and destination file (and optional encoding)" + eol); + System.out.println("Give source and destination file (and optional encoding)"); break; case 2: process(args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2011-02-03 13:12:44 UTC (rev 381) @@ -105,7 +105,6 @@ /** @return la chaine du footer */ abstract protected String getFooter(); - @Override public void setReader(LineNumberReader reader) { this.reader = reader; } @@ -122,7 +121,6 @@ return result; } - @Override public String parse(String input) { int matchingIndex; @@ -184,12 +182,10 @@ return sequence.length(); } - @Override public boolean hasCachedData() { return cachedContent.length() > 0; } - @Override public String flush() { String line = cachedContent.toString(); // Empty the cache, Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java 2011-02-03 13:12:44 UTC (rev 381) @@ -45,8 +45,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.Console; - /* * Classe principale du filtre de génération. Ce filtre recherche tout ce qu'il * y a entre les tag /*{ et }*/ a l'interieur de ces tags un autre filtre @@ -176,13 +174,11 @@ } public static void main(String[] args) { - String eol = System.getProperty("line.separator"); - Console console = System.console(); Filter filter = new GeneratorTemplatesFilter(); String res = filter.parse(" public void generatePackageStatement(Writer output, ObjectModelClassifier clazz) throws IOException {\n/*{\n package <%=clazz.getPackageName()%>.persistence.jdo; \n}*/ }"); - console.printf(res + eol); + System.out.println(res); res = filter.flush(); - console.printf(res + eol); + System.out.println(res); } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2011-02-03 13:12:44 UTC (rev 381) @@ -45,22 +45,18 @@ */ public class NoActionFilter implements Filter { - @Override public void setReader(LineNumberReader reader) { } - @Override public String parse(String input) { return input; } - @Override public boolean hasCachedData() { return false; } - @Override public String flush() { - return DefaultFilter.EMPTY_STRING; + return EMPTY_STRING; } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 10:58:24 UTC (rev 380) +++ trunk/pom.xml 2011-02-03 13:12:44 UTC (rev 381) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -246,10 +246,6 @@ <!-- pour un multi module on doit fixer le projectId --> <projectId>processor</projectId> - <!-- 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> <!-- ************************************************************* -->