Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-5717] Enrich toolchain xml with merge information 

Pushing version forward from 1.0.0 to 1.1.0
This commit is contained in:
Robert Scholte 2014-11-02 21:15:50 +01:00
parent 2d086fde25
commit 21c13ca484
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/pom.xml
View File

@ -187,7 +187,7 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.0.0</version>
<version>1.1.0</version>
<models>
<model>src/main/mdo/toolchains.mdo</model>
</models>

46
maven-core/src/main/mdo/toolchains.mdo
View File

@ -47,8 +47,53 @@
</defaults>
<classes>
<class java.clone="deep">
<name>TrackableBase</name>
<version>1.1.0+</version>
<description>
common base class that contains code to track the source for
this instance (USER|GLOBAL)
</description>
<codeSegments>
<codeSegment>
<version>1.1.0+</version>
<code>
<![CDATA[
public static final String USER_LEVEL = "user-level";
public static final String GLOBAL_LEVEL = "global-level";
private String sourceLevel = USER_LEVEL;
private boolean sourceLevelSet = false;
public void setSourceLevel( String sourceLevel )
{
if ( sourceLevelSet )
{
throw new IllegalStateException( "Cannot reset sourceLevel attribute; it is already set to: " + sourceLevel );
}
else if ( !( USER_LEVEL.equals( sourceLevel ) || GLOBAL_LEVEL.equals( sourceLevel ) ) )
{
throw new IllegalArgumentException( "sourceLevel must be one of: {" + USER_LEVEL + "," + GLOBAL_LEVEL + "}" );
}
else
{
this.sourceLevel = sourceLevel;
this.sourceLevelSet = true;
}
}
public String getSourceLevel()
{
return sourceLevel;
}
]]>
</code>
</codeSegment>
</codeSegments>
</class>
<class rootElement="true" xml.tagName="toolchains" xsd.compositor="sequence">
<name>PersistedToolchains</name>
<superClass>TrackableBase</superClass>
<description><![CDATA[
The <code>&lt;toolchains&gt;</code> element is the root of the descriptor.
The following table lists all of the possible child elements.
@ -68,6 +113,7 @@
</class>
<class>
<name>ToolchainModel</name>
<superClass>TrackableBase</superClass>
<version>1.0.0+</version>
<description>Definition of a toolchain instance.</description>
<fields>