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

r295 - trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 07:52:42 +0100 (Mon, 02 Nov 2009) New Revision: 295 Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java Log: fix potential NPE 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-11-02 03:47:37 UTC (rev 294) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-11-02 06:52:42 UTC (rev 295) @@ -20,18 +20,19 @@ */ package org.nuiton.processor.plugin; +import org.apache.maven.project.MavenProject; +import org.nuiton.io.MirroredFileUpdater; +import org.nuiton.plugin.AbstractPlugin; +import org.nuiton.plugin.PluginHelper; +import org.nuiton.processor.Processor; +import org.nuiton.processor.ProcessorUtil; + import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.util.Arrays; import java.util.Map; import java.util.Map.Entry; -import org.apache.maven.project.MavenProject; -import org.nuiton.plugin.AbstractPlugin; -import org.nuiton.processor.Processor; -import org.nuiton.processor.ProcessorUtil; -import org.nuiton.io.MirroredFileUpdater; -import org.nuiton.plugin.PluginHelper; /** * Maven2 plugin for Nuiton Processor. @@ -168,7 +169,9 @@ MirroredFileUpdater updater = overwrite ? null : new MirroredFileUpdater(fileInPattern, fileOutPattern, srcDir, destDir); - updater.setDestinationDirectory(destDir); + if (updater!=null) { + updater.setDestinationDirectory(destDir); + } String[] aIncludes = includes.split(","); String[] aExcludes = excludes == null ? null : excludes.split(",");

1 0

r294 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:47:37 +0100 (Mon, 02 Nov 2009) New Revision: 294 Modified: trunk/pom.xml Log: use mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:38:38 UTC (rev 293) +++ trunk/pom.xml 2009-11-02 03:47:37 UTC (rev 294) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> @@ -9,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>processor</artifactId> @@ -263,7 +264,7 @@ <properties>  <projectId>processor</projectId> - + </properties> <build> @@ -283,6 +284,6 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> - + </project>

1 0

r293 - in trunk: ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:38:38 +0100 (Mon, 02 Nov 2009) New Revision: 293 Modified: trunk/ant-processor-task/ trunk/maven-processor-plugin/ trunk/nuiton-processor/ Log: svn ignore idea files Property changes on: trunk/ant-processor-task ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Property changes on: trunk/maven-processor-plugin ___________________________________________________________________ Modified: svn:ignore - maven-processor-plugin.ipr target .classpath .project .settings + *.iml *.ipr *.iws target .classpath .project .settings Property changes on: trunk/nuiton-processor ___________________________________________________________________ Modified: svn:ignore - maven.log target velocity.log CodeLutinKeystore lutinprocessor.ipr .classpath .project .settings + maven.log target velocity.log CodeLutinKeystore *.ipr *.iml *.iws .classpath .project .settings

1 0

r292 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:35:21 +0100 (Mon, 02 Nov 2009) New Revision: 292 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target + target *.iml

1 0