You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/03/27 19:26:30 UTC
svn commit: r389203 - in /maven/components/trunk:
maven-plugin-tools/maven-plugin-tools-model/src/main/mdo/
maven-project/src/main/java/org/apache/maven/project/
maven-project/src/test/java/org/apache/maven/project/
Author: jdcasey
Date: Mon Mar 27 09:26:27 2006
New Revision: 389203
URL: http://svn.apache.org/viewcvs?rev=389203&view=rev
Log:
(Merging 389199:389201 from branch.)
o Cleaned up example in the comment-header of the plugin-metadata.mdo
o Added code to initialize a dummy Model instance in MavenProject, to avoid NPEs in things like getId().
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo?rev=389203&r1=389202&r2=389203&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo Mon Mar 27 09:26:27 2006
@@ -1,40 +1,51 @@
<!--
- <pluginMetadata>
- <mojos>
- <mojo goal="myGoal"
- phase="compile"
- requiresDependencyResolution="compile"
- requiresProject="true"
- requiresReports="true"
- requiresOnline="true"
- inheritByDefault="true"
- requiresDirectInvocation="true"
- aggregator="true">
+<pluginMetadata>
+ <mojos>
+ <mojo>
+ <goal>myGoal</goal>
+ <phase>compile</phase>
+ <requiresDependencyResolution>compile</requiresDependencyResolution>
+ <requiresProject>true</requiresProject>
+ <requiresReports>true</requiresReports>
+ <requiresOnline>true</requiresOnline>
+ <inheritByDefault>true</inheritByDefault>
+ <requiresDirectInvocation>true</requiresDirectInvocation>
+ <aggregator>true</aggregator>
- <execute phase="initialize" lifecycle="mine" goal="some:goal"/>
- <components>
- <component role="stuff" hint="more"/>
- </components>
- <parameters>
- <parameter name="nom"
- property="prop"
- required="true"
- readonly="true"
- expression="${my.property}"
- defaultValue="${project.artifactId}"
- type="org.apache.maven.project.MavenProject"
- alias="otherProp">
- <description>Test parameter</description>
- <deprecated>Use something else</deprecated>
- </parameter>
- </parameters>
- <description>
- This is a test.
- </description>
- <deprecated>Use another mojo</deprecated>
- </mojo>
- </mojos>
- </pluginMetadata>
+ <execute>
+ <phase>initialize</phase>
+ <lifecycle>mine</lifecycle>
+ <goal>goal</goal>
+ </execute>
+
+ <components>
+ <component>
+ <role>stuff</role>
+ <hint>more</hint>
+ </component>
+ </components>
+
+ <parameters>
+ <parameter>
+ <name>nom</name>
+ <property>prop</property>
+ <required>true</required>
+ <readonly>true</readonly>
+ <expression>${my.property}</expression>
+ <defaultValue>${project.artifactId}</defaultValue>
+ <type>org.apache.maven.project.MavenProject</type>
+ <alias>otherProp</alias>
+ <description>Test parameter</description>
+ <deprecated>Use something else</deprecated>
+ </parameter>
+ </parameters>
+ <description>
+ This is a test.
+ </description>
+ <deprecated>Use another mojo</deprecated>
+ </mojo>
+ </mojos>
+</pluginMetadata>
-->
<model>
<id>plugin-metadata</id>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=389203&r1=389202&r2=389203&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Mon Mar 27 09:26:27 2006
@@ -78,6 +78,12 @@
*/
public class MavenProject
{
+ public static final String EMPTY_PROJECT_GROUP_ID = "unknown";
+
+ public static final String EMPTY_PROJECT_ARTIFACT_ID = "empty-project";
+
+ public static final String EMPTY_PROJECT_VERSION = "0";
+
private Model model;
private MavenProject parent;
@@ -138,6 +144,17 @@
private boolean executionRoot;
private Map moduleAdjustments;
+
+ public MavenProject()
+ {
+ Model model = new Model();
+
+ model.setGroupId( EMPTY_PROJECT_GROUP_ID );
+ model.setArtifactId( EMPTY_PROJECT_ARTIFACT_ID );
+ model.setVersion( EMPTY_PROJECT_VERSION );
+
+ this.model = model;
+ }
public MavenProject( Model model )
{
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=389203&r1=389202&r2=389203&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java Mon Mar 27 09:26:27 2006
@@ -24,6 +24,15 @@
public class MavenProjectTest
extends AbstractMavenProjectTestCase
{
+
+ public void testEmptyConstructor()
+ {
+ MavenProject project = new MavenProject();
+
+ assertEquals( MavenProject.EMPTY_PROJECT_GROUP_ID + ":" + MavenProject.EMPTY_PROJECT_ARTIFACT_ID + ":jar:"
+ + MavenProject.EMPTY_PROJECT_VERSION, project.getId() );
+ }
+
public void testCopyConstructor() throws Exception
{
File f = getFileForClasspathResource( "canonical-pom.xml" );