From 6557e2d4be633d368bfd3b3cf67f8e0d1b72b4cf Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Fri, 13 May 2005 12:49:01 +0000
Subject: [PATCH] update archetypes

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170014 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-archetype/maven-archetype-core/pom.xml  |  8 ++---
 .../maven-archetype-plugin/pom.xml            |  8 ++---
 .../plugin/archetype/MavenArchetypeMojo.java  |  9 +++---
 .../maven-archetype-marmalade-mojo/pom.xml    |  5 ++-
 .../resources/archetype-resources/pom.xml     |  8 ++---
 .../src/main/resources/myMojo.mmld            |  3 +-
 .../maven-archetype-mojo/pom.xml              |  5 ++-
 .../resources/archetype-resources/pom.xml     |  2 +-
 .../src/main/java/MyMojo.java                 | 31 +++++++++----------
 .../maven-archetype-quickstart/pom.xml        |  5 ++-
 .../maven-archetype-webapp/pom.xml            |  5 ++-
 .../resources/archetype-resources/pom.xml     | 10 +-----
 maven-archetype/maven-archetypes/pom.xml      |  4 +--
 maven-archetype/pom.xml                       |  4 +--
 14 files changed, 44 insertions(+), 63 deletions(-)

diff --git a/maven-archetype/maven-archetype-core/pom.xml b/maven-archetype/maven-archetype-core/pom.xml
index f83a9db0e5..36fb5fa703 100644
--- a/maven-archetype/maven-archetype-core/pom.xml
+++ b/maven-archetype/maven-archetype-core/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>maven-archetype</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>1.0-alpha-1-SNAPSHOT</version>
+    <version>1.0-alpha-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-core</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-alpha-1-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
   <dependencies>
     <dependency>
       <groupId>plexus</groupId>
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
-      <version>1.0-alpha-2</version>
+      <version>1.0-alpha-3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/maven-archetype/maven-archetype-plugin/pom.xml b/maven-archetype/maven-archetype-plugin/pom.xml
index de6c077c8f..59bb583282 100644
--- a/maven-archetype/maven-archetype-plugin/pom.xml
+++ b/maven-archetype/maven-archetype-plugin/pom.xml
@@ -2,20 +2,18 @@
   <parent>
     <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0-alpha-2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Archetype Plugin</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archetype-core</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <version>1.0-alpha-1</version>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java b/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java
index fe9fa36641..49e29da74c 100644
--- a/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java
+++ b/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java
@@ -65,19 +65,19 @@ public class MavenArchetypeMojo
      * @parameter expression="${archetypeVersion}"
      * @required
      */
-    private String archetypeVersion = "1.0-alpha-1-SNAPSHOT";
+    private String archetypeVersion = "RELEASE";
 
     /**
      * @parameter expression="${groupId}"
      * @required
      */
-    private String groupId = "org.apache.maven.archetypes";
+    private String groupId;
 
     /**
      * @parameter expression="${artifactId}"
      * @required
      */
-    private String artifactId = "maven-archetype-quickstart";
+    private String artifactId;
 
     /**
      * @parameter expression="${version}"
@@ -86,7 +86,7 @@ public class MavenArchetypeMojo
     private String version = "1.0-SNAPSHOT";
 
     /**
-     * @parameter expression="${packageName}"
+     * @parameter expression="${packageName}" alias="package"
      * @required
      */
     private String packageName = "com.mycompany.app";
@@ -101,7 +101,6 @@ public void execute()
         throws MojoExecutionException
     {
         // TODO: prompt for missing values
-        // TODO: use new plugin type
         // TODO: configurable license
 
         // ----------------------------------------------------------------------
diff --git a/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml
index edb107d74c..030efab00a 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml
+++ b/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml
@@ -2,10 +2,9 @@
   <parent>
     <artifactId>maven-archetypes</artifactId>
     <groupId>org.apache.maven.archetypes</groupId>
-    <version>1.0-alpha-1-SNAPSHOT</version>
+    <version>1.0-alpha-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-marmalade-mojo</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-alpha-1-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
 </model>
diff --git a/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
index 18cf9ac745..21549190fb 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
@@ -8,25 +8,25 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
 
     <dependency>
       <groupId>marmalade</groupId>
       <artifactId>marmalade-core</artifactId>
-      <version>1.0-alpha-2</version>
+      <version>1.0-alpha-3</version>
     </dependency>
 
     <dependency>
       <groupId>marmalade</groupId>
       <artifactId>marmalade-el-commons</artifactId>
-      <version>1.0-alpha-2</version>
+      <version>1.0-alpha-3</version>
     </dependency>
     
     <dependency>
       <groupId>marmalade</groupId>
       <artifactId>marmalade-tags-io</artifactId>
-      <version>1.0-alpha-2</version>
+      <version>1.0-alpha-3</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld b/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld
index 61a935502a..4dbe57c695 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld
+++ b/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld
@@ -2,13 +2,12 @@
 
 <mojo xmlns="marmalade:mojo">
   <metadata>
-    <id>myMojo</id>
     <goal>myMojo</goal>
     <description>Output a file with specified contents to [outputDirectory]/touch.txt</description>
     <parameters>
       <parameter>
         <name>outputDirectory</name>
-        <expression>#project.build.directory</expression>
+        <expression>${project.build.directory}</expression>
         <description>Output directory for files.</description>
       </parameter>
     </parameters>
diff --git a/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
index 84b3e6f6c8..10c4df1cb4 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
+++ b/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
@@ -2,10 +2,9 @@
   <parent>
     <artifactId>maven-archetypes</artifactId>
     <groupId>org.apache.maven.archetypes</groupId>
-    <version>1.0-alpha-1-SNAPSHOT</version>
+    <version>1.0-alpha-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-mojo</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-alpha-1-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
 </model>
diff --git a/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
index d976a8394f..14d9fa2835 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
@@ -8,7 +8,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>2.0-alpha-2</version>
     </dependency>
 
     <dependency>
diff --git a/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java b/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
index 7685b5d49e..9476efc933 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
+++ b/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
@@ -16,37 +16,34 @@
  * limitations under the License.
  */
 
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
 /**
+ * Goal which touches a timestamp file.
+ *
  * @goal touch
  * 
  * @phase process-sources
- *
- * @description Goal which touches a timestamp file
- *
- * @parameter
- *  name="outputDirectory"
- *  type="java.io.File"
- *  required="true"
- *  validator=""
- *  expression="#project.build.directory"
- *  description=""
  */
 public class MyMojo
-    extends AbstractPlugin
+    extends AbstractMojo
 {
-    private String outputDirectory;
+    /**
+     * Location of the file.
+     * @parameter expression="${project.build.directory}"
+     * @required
+     */
+    private File outputDirectory;
 
     public void execute()
-        throws PluginExecutionException
+        throws MojoExecutionException
     {
-        File f = new File( outputDirectory );
+        File f = outputDirectory;
 
         if ( !f.exists() )
         {
@@ -64,7 +61,7 @@ public void execute()
         }
         catch ( IOException e )
         {
-            throw new PluginExecutionException( "Error creating file " + touch, e );
+            throw new MojoExecutionException( "Error creating file " + touch, e );
         }
         finally
         {
diff --git a/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
index 8992f03764..5bc1ce4226 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
+++ b/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
@@ -2,10 +2,9 @@
   <parent>
     <artifactId>maven-archetypes</artifactId>
     <groupId>org.apache.maven.archetypes</groupId>
-    <version>1.0-alpha-1-SNAPSHOT</version>
+    <version>1.0-alpha-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-quickstart</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-alpha-1-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
 </model>
diff --git a/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
index 308757f61a..37aa3ceb60 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
+++ b/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
@@ -2,10 +2,9 @@
   <parent>
     <artifactId>maven-archetypes</artifactId>
     <groupId>org.apache.maven.archetypes</groupId>
-    <version>1.0-alpha-1-SNAPSHOT</version>
+    <version>1.0-alpha-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype-webapp</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-alpha-1-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
 </model>
diff --git a/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
index c2b678f73b..10bfe9ff74 100644
--- a/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
@@ -13,14 +13,6 @@
     </dependency>
   </dependencies>
   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>1.0-alpha-1</version>
-        <configuration>
-          <warName>${artifactId}</warName>
-        </configuration>
-      </plugin>
-    </plugins>
+    <finalName>${artifactId}</finalName>
   </build>
 </model>
diff --git a/maven-archetype/maven-archetypes/pom.xml b/maven-archetype/maven-archetypes/pom.xml
index 6452d8a0c5..1dd619333b 100644
--- a/maven-archetype/maven-archetypes/pom.xml
+++ b/maven-archetype/maven-archetypes/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>maven-archetype</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>1.0-alpha-1-SNAPSHOT</version>
+    <version>1.0-alpha-1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.archetypes</groupId>
   <artifactId>maven-archetypes</artifactId>
   <packaging>pom</packaging>
-  <version>1.0-alpha-1-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
   <modules>
     <module>maven-archetype-marmalade-mojo</module>
     <module>maven-archetype-mojo</module>
diff --git a/maven-archetype/pom.xml b/maven-archetype/pom.xml
index 8172b9ff13..828a80bae2 100644
--- a/maven-archetype/pom.xml
+++ b/maven-archetype/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0-alpha-2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-archetype</artifactId>
   <packaging>pom</packaging>
-  <version>1.0-alpha-1-SNAPSHOT</version>
+  <version>1.0-alpha-1</version>
   <modules>
     <module>maven-archetype-core</module>
     <module>maven-archetype-plugin</module>