From 233d5aba1ba79bb498df1f0eac4661db87cc25e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 23 May 2012 21:17:22 +0300
Subject: [PATCH] changed targetFolder type in GenericExporterMojo

---
 .../com/mysema/query/maven/AbstractExporterMojo.java  | 11 ++---------
 .../mysema/query/maven/GenericExporterMojoTest.java   |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractExporterMojo.java
index 71658199f..25342c4be 100644
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractExporterMojo.java
+++ b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractExporterMojo.java
@@ -40,7 +40,7 @@ public abstract class AbstractExporterMojo extends AbstractMojo {
     /**
      * @parameter
      */
-    private String targetFolder;
+    private File targetFolder;
     
     /**
      * @parameter default-value=false
@@ -81,14 +81,7 @@ public abstract class AbstractExporterMojo extends AbstractMojo {
         
         Charset charset = sourceEncoding != null ? Charset.forName(sourceEncoding) : Charset.defaultCharset();
         GenericExporter exporter = new GenericExporter(classLoader, charset);
-        
-        // see http://maven.apache.org/plugin-developers/common-bugs.html#Resolving_Relative_Paths,
-        // Consider changing targetFolder to type File instead
-        File targetDir = new File(targetFolder);
-        if(!targetDir.isAbsolute()) {
-        	targetDir = new File(project.getBasedir(), targetFolder);
-        }
-        exporter.setTargetFolder(targetDir);
+        exporter.setTargetFolder(targetFolder);
         
         if (scala) {
             try {
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/GenericExporterMojoTest.java b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/GenericExporterMojoTest.java
index a96e095f8..e31fcd350 100644
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/GenericExporterMojoTest.java
+++ b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/GenericExporterMojoTest.java
@@ -19,7 +19,7 @@ public class GenericExporterMojoTest extends AbstractMojoTest {
         mavenProject.getBuild().setOutputDirectory("target/classes");
         
         GenericExporterMojo mojo = new GenericExporterMojo();
-        set(mojo, "targetFolder", "target/generated-test-data");
+        set(mojo, "targetFolder", new File("target/generated-test-data"));
         set(mojo, "packages", new String[]{"com.mysema.query.maven"});
         set(mojo, "project", mavenProject);
         mojo.execute();