You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/12/28 14:34:41 UTC
svn commit: r729733 -
/maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo
Author: hboutemy
Date: Sun Dec 28 05:34:41 2008
New Revision: 729733
URL: http://svn.apache.org/viewvc?rev=729733&view=rev
Log:
o Consequently used http://maven.apache.org/xsd/* for the schema locations (see r729720) (merged from 2.0.10RC branch r729731)
Modified:
maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo
Modified: maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo?rev=729733&r1=729732&r2=729733&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/branches/maven-2.1.x/maven-model/src/main/mdo/maven.mdo Sun Dec 28 05:34:41 2008
@@ -51,8 +51,8 @@
<p>This is a reference for the Maven project descriptor used in Maven.</p>
<p>An XSD is available at:</p>
<ul>
- <li><a href="http://maven.apache.org/maven-v3_0_0.xsd">http://maven.apache.org/maven-v3_0_0.xsd</a> for Maven 1.1.</li>
- <li><a href="http://maven.apache.org/maven-v4_0_0.xsd">http://maven.apache.org/maven-v4_0_0.xsd</a> for Maven 2.0.</li>
+ <li><a href="http://maven.apache.org/xsd/maven-v3_0_0.xsd">http://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li>
+ <li><a href="http://maven.apache.org/xsd/maven-4_0_0.xsd">http://maven.apache.org/xsd/maven-4_0_0.xsd</a> for Maven 2.0.</li>
</ul>
]]>
</description>
@@ -2126,7 +2126,7 @@
<description>
<![CDATA[
FOR INTERNAL USE ONLY. This is a unique identifier assigned to each
- resource to allow Maven to merge changes to this resource that take
+ resource to allow Maven to merge changes to this resource that take
place during the execution of a plugin. This field must be managed
by the generated parser and formatter classes in order to allow it
to survive model interpolation.
@@ -2141,7 +2141,7 @@
<code>
<![CDATA[
private static int mergeIdCounter = 0;
-
+
public void initMergeId()
{
if ( getMergeId() == null )
@@ -2149,7 +2149,7 @@
setMergeId( "resource-" + (mergeIdCounter++) );
}
}
-
+
/**
* @see java.lang.Object#toString()
*/