Author: brett
Date: Fri May 13 05:49:01 2005
New Revision: 170014
URL: http://svn.apache.org/viewcvs?rev=170014&view=rev
Log:
update archetypes
Modified:
maven/components/trunk/maven-archetype/ (props changed)
maven/components/trunk/maven-archetype/maven-archetype-core/pom.xml
maven/components/trunk/maven-archetype/maven-archetype-plugin/pom.xml
maven/components/trunk/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/
(props changed)
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
maven/components/trunk/maven-archetype/maven-archetypes/pom.xml
maven/components/trunk/maven-archetype/pom.xml
Propchange: maven/components/trunk/maven-archetype/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 13 05:49:01 2005
@@ -1,3 +1,4 @@
*.ipr
*.iml
*.iws
+target
Modified: maven/components/trunk/maven-archetype/maven-archetype-core/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetype-core/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
--- maven/components/trunk/maven-archetype/maven-archetype-core/pom.xml
(original)
+++ maven/components/trunk/maven-archetype/maven-archetype-core/pom.xml Fri May
13 05:49:01 2005
@@ -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>
Modified: maven/components/trunk/maven-archetype/maven-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetype-plugin/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
--- maven/components/trunk/maven-archetype/maven-archetype-plugin/pom.xml
(original)
+++ maven/components/trunk/maven-archetype/maven-archetype-plugin/pom.xml Fri
May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java
(original)
+++
maven/components/trunk/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypeMojo.java
Fri May 13 05:49:01 2005
@@ -65,19 +65,19 @@
* @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 @@
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 @@
throws MojoExecutionException
{
// TODO: prompt for missing values
- // TODO: use new plugin type
// TODO: configurable license
//
----------------------------------------------------------------------
Propchange:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 13 05:49:01 2005
@@ -1,4 +1,4 @@
*.ipr
*.iml
*.iws
-
+target
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/pom.xml
Fri May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
Fri May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/src/main/resources/myMojo.mmld
Fri May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
Fri May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
Fri May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
Fri May 13 05:49:01 2005
@@ -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 @@
}
catch ( IOException e )
{
- throw new PluginExecutionException( "Error creating file " +
touch, e );
+ throw new MojoExecutionException( "Error creating file " + touch,
e );
}
finally
{
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
Fri May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
Fri May 13 05:49:01 2005
@@ -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>
Modified:
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
---
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/components/trunk/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
Fri May 13 05:49:01 2005
@@ -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>
Modified: maven/components/trunk/maven-archetype/maven-archetypes/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/maven-archetypes/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
--- maven/components/trunk/maven-archetype/maven-archetypes/pom.xml (original)
+++ maven/components/trunk/maven-archetype/maven-archetypes/pom.xml Fri May 13
05:49:01 2005
@@ -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>
Modified: maven/components/trunk/maven-archetype/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-archetype/pom.xml?rev=170014&r1=170013&r2=170014&view=diff
==============================================================================
--- maven/components/trunk/maven-archetype/pom.xml (original)
+++ maven/components/trunk/maven-archetype/pom.xml Fri May 13 05:49:01 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
