From ba29a35444a34af582eb20801d0cd5e50e981f8a Mon Sep 17 00:00:00 2001
From: felipeal <felipeal@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 24 Oct 2005 19:01:30 +0000
Subject: [PATCH] MPGENAPP-24:added property maven.genapp.basedir

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@328133 13f79535-47bb-0310-9956-ffa450edef68
---
 genapp/plugin.jelly                           | 12 ++++--
 genapp/plugin.properties                      |  3 ++
 genapp/src/plugin-test/basedirTest/maven.xml  | 36 ++++++++++++++++
 .../basedirTest/project.properties            | 16 +++++++
 .../src/plugin-test/basedirTest/project.xml   | 36 ++++++++++++++++
 genapp/src/plugin-test/maven.xml              | 22 ++++++++++
 genapp/src/plugin-test/project.xml            | 42 +++++++++++++++++++
 genapp/xdocs/changes.xml                      |  1 +
 genapp/xdocs/properties.xml                   |  9 ++++
 9 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 genapp/src/plugin-test/basedirTest/maven.xml
 create mode 100644 genapp/src/plugin-test/basedirTest/project.properties
 create mode 100644 genapp/src/plugin-test/basedirTest/project.xml
 create mode 100644 genapp/src/plugin-test/maven.xml
 create mode 100644 genapp/src/plugin-test/project.xml

diff --git a/genapp/plugin.jelly b/genapp/plugin.jelly
index 7aa54661..de287f86 100644
--- a/genapp/plugin.jelly
+++ b/genapp/plugin.jelly
@@ -33,6 +33,10 @@
      |
      -->
     <define:tag name="generate">
+      
+      <!-- Where the files will be created -->
+      <j:set var="generatedBasedir" value="${maven.genapp.basedir}"/>
+      
       <!-- If a template directory is provided directly, then use it (and don't ask)! -->
       <j:set var="currenttemplatedir" value="${maven.genapp.template.dir}"/>
       <j:if test="${empty(currenttemplatedir)}">
@@ -127,14 +131,14 @@
   
       <!-- copy resources that need repackaged, eg java files -->
       <j:forEach var="res" items="${maven.genapp.repackage.split}">
-        <ant:copy todir="${basedir}/src/${res}/${appPath}" 
+        <ant:copy todir="${generatedBasedir}/src/${res}/${appPath}" 
               filtering="true">
           <ant:fileset dir="${maven.genapp.resources}/src/${res}" />
         </ant:copy>      
       </j:forEach>
   
       <!-- copy resources that just need filtered, eg project.xml -->
-      <ant:copy todir="${basedir}" filtering="true">      
+      <ant:copy todir="${generatedBasedir}" filtering="true">      
         <ant:fileset dir="${maven.genapp.resources}">
           <j:forEach var="res" items="${maven.genapp.filter.split}">
             <ant:include name="${res}"/>
@@ -143,7 +147,7 @@
       </ant:copy>
   
       <!-- copy rest of app unfiltered -->
-      <ant:copy todir="${basedir}">      
+      <ant:copy todir="${generatedBasedir}">      
         <ant:fileset dir="${maven.genapp.resources}">
           <ant:exclude name="src/java"/>
           <ant:exclude name="src/test"/>
@@ -157,7 +161,7 @@
       </ant:copy>
 	  
       <!-- copy config files normally excluded by Ant default excludes -->
-      <ant:copy todir="${basedir}">
+      <ant:copy todir="${generatedBasedir}">
         <ant:fileset dir="${maven.genapp.resources}" defaultexcludes="no">
           <ant:include name="**/.*"/>
           <ant:exclude name="**/.svn/**"/>
diff --git a/genapp/plugin.properties b/genapp/plugin.properties
index 565d7caa..fb0810b3 100644
--- a/genapp/plugin.properties
+++ b/genapp/plugin.properties
@@ -29,3 +29,6 @@ maven.genapp.default.package=example.app
 maven.genapp.prompt.package=Please specify the package for your application: 
 
 maven.genapp.default.user=${user.name}
+
+# directory where the artefacts will be created
+maven.genapp.basedir=${basedir}
diff --git a/genapp/src/plugin-test/basedirTest/maven.xml b/genapp/src/plugin-test/basedirTest/maven.xml
new file mode 100644
index 00000000..b16459f8
--- /dev/null
+++ b/genapp/src/plugin-test/basedirTest/maven.xml
@@ -0,0 +1,36 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project xmlns:j="jelly:core" 
+         xmlns:u="jelly:util" 
+         xmlns:x="jelly:xml"
+         xmlns:assert="assert"
+         xmlns:j2ee="j2ee"
+         default="testPlugin">
+
+  <goal name="testPlugin" prereqs="test-genapp">
+    <attainGoal name="clean"/>
+  </goal>
+  
+  <goal name="test-genapp" prereqs="clean">
+    <j:set var="maven.genapp.prompt.id" value="" scope="parent"/>
+    <!-- TODO: figure it out how to not ask for stuff... -->
+    <attainGoal name="genapp"/>
+    <assert:assertFileExists file="${maven.genapp.basedir}"/>
+  </goal>
+
+</project>
diff --git a/genapp/src/plugin-test/basedirTest/project.properties b/genapp/src/plugin-test/basedirTest/project.properties
new file mode 100644
index 00000000..3b435359
--- /dev/null
+++ b/genapp/src/plugin-test/basedirTest/project.properties
@@ -0,0 +1,16 @@
+# -------------------------------------------------------------------
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+maven.genapp.basedir=${maven.build.dir}/my_genapp
diff --git a/genapp/src/plugin-test/basedirTest/project.xml b/genapp/src/plugin-test/basedirTest/project.xml
new file mode 100644
index 00000000..5cc29f8a
--- /dev/null
+++ b/genapp/src/plugin-test/basedirTest/project.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/3.0.0
+http://maven.apache.org/maven-v3_0_0.xsd">
+  <pomVersion>3</pomVersion>
+  <name>Genapp Plugin - Basedir Test</name>
+  <artifactId>test-maven-genapp-plugin-basedirTest</artifactId>
+  <inceptionYear>2005</inceptionYear>
+  <shortDescription>Tests maven.genapp.basedir property</shortDescription>
+  <description>Tests maven.genapp.basedir property</description>
+  <url/>
+  <developers>
+    <developer>
+      <name>Felipe Leme</name>
+      <id>felipeal</id>
+      <email>maven@felipeal.net</email>
+      <organization>Falcon Informatica</organization>
+    </developer>
+  </developers>
+</project>
diff --git a/genapp/src/plugin-test/maven.xml b/genapp/src/plugin-test/maven.xml
new file mode 100644
index 00000000..34300aa4
--- /dev/null
+++ b/genapp/src/plugin-test/maven.xml
@@ -0,0 +1,22 @@
+<!-- 
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project xmlns:util="jelly:util" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:ant="jelly:ant">
+  <goal name="testPlugin">
+    <maven:reactor basedir="${basedir}" includes="*Test/project.xml" goals="testPlugin" banner="Test" ignoreFailures="false"/>
+  </goal>
+</project>
diff --git a/genapp/src/plugin-test/project.xml b/genapp/src/plugin-test/project.xml
new file mode 100644
index 00000000..f112f1e8
--- /dev/null
+++ b/genapp/src/plugin-test/project.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+
+<project>
+  <pomVersion>3</pomVersion>
+  <name>Test project for Maven Genapp Plugin</name>
+  <groupId>maven</groupId>
+  <currentVersion>1.0</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
+  </organization>
+  <inceptionYear>2005</inceptionYear>
+  <package>org.apache.maven</package>
+  <logo>http://maven.apache.org/images/maven.gif</logo>
+  <description>Test for Maven Genapp plugin</description>
+  <shortDescription>Test for Maven Genapp plugin</shortDescription>
+  <url>http://maven.apache.org/reference/plugins/genapp/</url>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/genapp/</connection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/genapp/</url>
+  </repository>
+</project>
\ No newline at end of file
diff --git a/genapp/xdocs/changes.xml b/genapp/xdocs/changes.xml
index 5626440f..a645e081 100644
--- a/genapp/xdocs/changes.xml
+++ b/genapp/xdocs/changes.xml
@@ -22,6 +22,7 @@
   </properties>
   <body>
     <release version="2.3-SNAPSHOT" date="in SVN">
+      <action dev="felipeal" type="add" issue="MPGENAPP-24">Added new property <code>maven.genapp.basedir property</code>.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
           <li>commons-logging v1.0.3 -> v1.0.4</li>
diff --git a/genapp/xdocs/properties.xml b/genapp/xdocs/properties.xml
index 97efab58..34f33914 100644
--- a/genapp/xdocs/properties.xml
+++ b/genapp/xdocs/properties.xml
@@ -95,6 +95,15 @@
             ${maven.home.local}/template
           </td>
         </tr>
+        <tr>
+          <td>maven.genapp.basedir</td>
+          <td>
+            Directory where the new project will be generated.
+          </td>
+          <td>
+            ${basedir}
+          </td>
+        </tr>
       </table>
     </section>
     <section name="Application Generation Filter Settings">