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

r389 - trunk
by tchemit＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:30:58 +0100 (Wed, 16 Feb 2011) New Revision: 389 Url: http://nuiton.org/repositories/revision/processor/389 Log: Update mavenpom4redmineAndCentral to 2.5.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-10 12:18:17 UTC (rev 388) +++ trunk/pom.xml 2011-02-16 21:30:58 UTC (rev 389) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <artifactId>processor</artifactId>

1 0

r388 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 13:18:17 +0100 (Thu, 10 Feb 2011) New Revision: 388 Url: http://nuiton.org/repositories/revision/processor/388 Log: Update mavenpom4redmineAndCentral to 2.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:23:19 UTC (rev 387) +++ trunk/pom.xml 2011-02-10 12:18:17 UTC (rev 388) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <artifactId>processor</artifactId>

1 0

r387 - trunk
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:23:19 +0100 (Wed, 09 Feb 2011) New Revision: 387 Url: http://nuiton.org/repositories/revision/processor/387 Log: Update mavenpom4redmineAndCentral to 2.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 15:10:51 UTC (rev 386) +++ trunk/pom.xml 2011-02-09 08:23:19 UTC (rev 387) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.3</version> + <version>2.4.4</version> </parent> <artifactId>processor</artifactId>

1 0

r386 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 16:10:51 +0100 (Thu, 03 Feb 2011) New Revision: 386 Url: http://nuiton.org/repositories/revision/processor/386 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-02-03 15:10:49 UTC (rev 385) +++ trunk/ant-processor-task/pom.xml 2011-02-03 15:10:51 UTC (rev 386) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-02-03 15:10:49 UTC (rev 385) +++ trunk/maven-processor-plugin/pom.xml 2011-02-03 15:10:51 UTC (rev 386) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-02-03 15:10:49 UTC (rev 385) +++ trunk/nuiton-processor/pom.xml 2011-02-03 15:10:51 UTC (rev 386) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 15:10:49 UTC (rev 385) +++ trunk/pom.xml 2011-02-03 15:10:51 UTC (rev 386) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -262,11 +262,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2.1 + scm:svn:http://svn.nuiton.org/svn/processor/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.2.1</url> + <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> </project>

1 0

r385 - tags
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 16:10:49 +0100 (Thu, 03 Feb 2011) New Revision: 385 Url: http://nuiton.org/repositories/revision/processor/385 Log: [maven-release-plugin] copy for tag processor-1.2.1 Added: tags/processor-1.2.1/

1 0

r384 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 16:10:47 +0100 (Thu, 03 Feb 2011) New Revision: 384 Url: http://nuiton.org/repositories/revision/processor/384 Log: [maven-release-plugin] prepare release processor-1.2.1 Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-02-03 15:05:53 UTC (rev 383) +++ trunk/ant-processor-task/pom.xml 2011-02-03 15:10:47 UTC (rev 384) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-02-03 15:05:53 UTC (rev 383) +++ trunk/maven-processor-plugin/pom.xml 2011-02-03 15:10:47 UTC (rev 384) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-02-03 15:05:53 UTC (rev 383) +++ trunk/nuiton-processor/pom.xml 2011-02-03 15:10:47 UTC (rev 384) @@ -24,9 +24,7 @@ #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> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 15:05:53 UTC (rev 383) +++ trunk/pom.xml 2011-02-03 15:10:47 UTC (rev 384) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> <modules> <module>nuiton-processor</module> @@ -262,11 +262,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk + scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.2.1</url> </scm> </project>

1 0

r383 - trunk
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 16:05:53 +0100 (Thu, 03 Feb 2011) New Revision: 383 Url: http://nuiton.org/repositories/revision/processor/383 Log: Evolution #1288: Updates m-helper-p to 1.2.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 14:09:30 UTC (rev 382) +++ trunk/pom.xml 2011-02-03 15:05:53 UTC (rev 383) @@ -246,7 +246,7 @@  <projectId>processor</projectId> - <helperPluginVersion>1.2.11-SNAPSHOT</helperPluginVersion> + <helperPluginVersion>1.2.11</helperPluginVersion>

1 0

r382 - in trunk: . ant-processor-task ant-processor-task/src/main/java/org/nuiton/processor/ant maven-processor-plugin maven-processor-plugin/src/main/java/org/nuiton/processor/plugin nuiton-processor
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

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 @@  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> -  - <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>  <projectId>processor</projectId> - + + <helperPluginVersion>1.2.11-SNAPSHOT</helperPluginVersion> + +  + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> + </properties>

1 0

r381 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor nuiton-processor/src/main/java/org/nuiton/processor nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

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>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + +  + <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> +  <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 @@  <projectId>processor</projectId> -  - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.target>1.5</maven.compiler.target> - </properties>

1 0

r380 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:58:24 +0100 (Thu, 03 Feb 2011) New Revision: 380 Url: http://nuiton.org/repositories/revision/processor/380 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-02-03 10:58:23 UTC (rev 379) +++ trunk/ant-processor-task/pom.xml 2011-02-03 10:58:24 UTC (rev 380) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2</version> + <version>1.3-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:23 UTC (rev 379) +++ trunk/maven-processor-plugin/pom.xml 2011-02-03 10:58:24 UTC (rev 380) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-02-03 10:58:23 UTC (rev 379) +++ trunk/nuiton-processor/pom.xml 2011-02-03 10:58:24 UTC (rev 380) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 10:58:23 UTC (rev 379) +++ trunk/pom.xml 2011-02-03 10:58:24 UTC (rev 380) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -259,11 +259,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2 + scm:svn:http://svn.nuiton.org/svn/processor/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.2</url> + <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> </project>

1 0