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

o upgraded Modello version to 1.0 

o improved models to use Modello new features (merged from 2.1.x branch r745216)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745260 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Herve Boutemy 2009-02-17 21:46:38 +00:00
parent 29df2bf1bf
commit 3d52a23b10
9 changed files with 134 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.xml
View File

@ -139,12 +139,13 @@ END SNIPPET: ant-bootstrap -->
<sequential> <sequential>
<java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true"> <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true">
<classpath refid="modello.pathid"/> <classpath refid="modello.pathid"/>
<arg file="@{file}"/> <arg file="@{file}"/> <!-- model file -->
<arg value="@{mode}"/> <arg value="@{mode}"/> <!-- output type -->
<arg file="bootstrap/target/generated-sources"/> <arg file="bootstrap/target/generated-sources"/> <!-- output directory -->
<arg value="@{version}"/> <arg value="@{version}"/> <!-- model version -->
<arg value="false"/> <arg value="false"/> <!-- package with version -->
<arg value="false"/> <arg value="true"/> <!-- use Java 5 -->
<arg value="UTF-8"/> <!-- encoding -->
</java> </java>
</sequential> </sequential>
</macrodef> </macrodef>

5
maven-compat/src/main/mdo/metadata.mdo
View File

@ -17,7 +17,10 @@ specific language governing permissions and limitations
under the License. under the License.
--> -->
<model> <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/METADATA/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/metadata-${version}.xsd">
<id>repository-metadata</id> <id>repository-metadata</id>
<name>Metadata</name> <name>Metadata</name>
<description>Per-directory repository metadata.</description> <description>Per-directory repository metadata.</description>

6
maven-core/src/main/mdo/settings.mdo
View File

@ -19,8 +19,10 @@
under the License. under the License.
--> -->
<model xsd.namespace="http://maven.apache.org/SETTINGS/1.0.0" <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsd.target-namespace="http://maven.apache.org/SETTINGS/1.0.0"> xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/SETTINGS/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/settings-${version}.xsd">
<id>settings</id> <id>settings</id>
<name>Settings</name> <name>Settings</name>
<description> <description>

5
maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
View File

@ -23,7 +23,10 @@
<!-- <!--
*** NOTE: If you add a new lifecycle or phase, be sure to update the codeSegments! *** *** NOTE: If you add a new lifecycle or phase, be sure to update the codeSegments! ***
--> -->
<model> <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/MAVEN_LIFECYCLE/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/maven-lifecycle-${version}.xsd">
<id>build-lifecycle</id> <id>build-lifecycle</id>
<name>LifecycleBindings</name> <name>LifecycleBindings</name>
<description>Model for lifecycle specifications starting in Maven 2.1</description> <description>Model for lifecycle specifications starting in Maven 2.1</description>

41
maven-model/src/main/mdo/maven.mdo
View File

@ -43,7 +43,10 @@
| definition of these types | definition of these types
| |
--> -->
<model xsd.namespace="http://maven.apache.org/POM/4.0.0" xsd.target-namespace="http://maven.apache.org/POM/4.0.0"> <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/POM/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/maven-${version}.xsd">
<id>maven</id> <id>maven</id>
<name>Maven</name> <name>Maven</name>
<description> <description>
@ -103,7 +106,7 @@
<!-- Parent Model --> <!-- Parent Model -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>extend</name> <name>extend</name>
<version>3.0.0</version> <version>3.0.0</version>
<description> <description>
@ -117,7 +120,7 @@
</description> </description>
<type>String</type> <type>String</type>
</field> </field>
<field> <field xdoc.separator="blank">
<name>parent</name> <name>parent</name>
<version>4.0.0</version> <version>4.0.0</version>
<description>The location of the parent project, if one exists. Values from the parent <description>The location of the parent project, if one exists. Values from the parent
@ -132,7 +135,7 @@
<!-- groupId/artifactId/Version/Packaging --> <!-- groupId/artifactId/Version/Packaging -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>groupId</name> <name>groupId</name>
<version>3.0.0+</version> <version>3.0.0+</version>
<required>true</required> <required>true</required>
@ -212,7 +215,7 @@
<!-- Elements which describe a project --> <!-- Elements which describe a project -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>name</name> <name>name</name>
<version>3.0.0+</version> <version>3.0.0+</version>
<required>true</required> <required>true</required>
@ -312,7 +315,7 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>mailingLists</name> <name>mailingLists</name>
<version>3.0.0+</version> <version>3.0.0+</version>
<description>Contains information about a project's mailing lists.</description> <description>Contains information about a project's mailing lists.</description>
@ -321,7 +324,7 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>developers</name> <name>developers</name>
<version>3.0.0+</version> <version>3.0.0+</version>
<description>Describes the committers of a project.</description> <description>Describes the committers of a project.</description>
@ -344,13 +347,13 @@
<!-- Issue Tracking --> <!-- Issue Tracking -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>issueTrackingUrl</name> <name>issueTrackingUrl</name>
<version>3.0.0</version> <version>3.0.0</version>
<description>The URL of the project's issue tracking system.</description> <description>The URL of the project's issue tracking system.</description>
<type>String</type> <type>String</type>
</field> </field>
<field> <field xdoc.separator="blank">
<name>issueManagement</name> <name>issueManagement</name>
<version>4.0.0</version> <version>4.0.0</version>
<description>The project's issue management system information.</description> <description>The project's issue management system information.</description>
@ -363,7 +366,7 @@
<!-- SCM --> <!-- SCM -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>branches</name> <name>branches</name>
<version>3.0.0</version> <version>3.0.0</version>
<description> <description>
@ -493,7 +496,7 @@
<!-- Build prerequisites --> <!-- Build prerequisites -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>prerequisites</name> <name>prerequisites</name>
<version>4.0.0</version> <version>4.0.0</version>
<description>Describes the prerequisites in the build environment for this project.</description> <description>Describes the prerequisites in the build environment for this project.</description>
@ -506,7 +509,7 @@
<!-- Build --> <!-- Build -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>build</name> <name>build</name>
<version>3.0.0+</version> <version>3.0.0+</version>
<required>true</required> <required>true</required>
@ -520,7 +523,7 @@
<!-- Profiles --> <!-- Profiles -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<field> <field xdoc.separator="blank">
<name>profiles</name> <name>profiles</name>
<version>4.0.0</version> <version>4.0.0</version>
<description>A listing of project-local build profiles which will modify the build process <description>A listing of project-local build profiles which will modify the build process
@ -603,7 +606,7 @@
<type>DistributionManagement</type> <type>DistributionManagement</type>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>modules</name> <name>modules</name>
<version>4.0.0</version> <version>4.0.0</version>
<description>The modules (sometimes called subprojects) to build as a part of this <description>The modules (sometimes called subprojects) to build as a part of this
@ -613,7 +616,7 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>repositories</name> <name>repositories</name>
<version>4.0.0</version> <version>4.0.0</version>
<description>The lists of the remote repositories for discovering dependencies and <description>The lists of the remote repositories for discovering dependencies and
@ -633,7 +636,7 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>dependencies</name> <name>dependencies</name>
<version>3.0.0+</version> <version>3.0.0+</version>
<description> <description>
@ -652,7 +655,7 @@
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>reports</name> <name>reports</name>
<version>4.0.0</version> <version>4.0.0</version>
<description> <description>
@ -677,7 +680,7 @@
<type>Reporting</type> <type>Reporting</type>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>dependencyManagement</name> <name>dependencyManagement</name>
<version>4.0.0</version> <version>4.0.0</version>
<required>false</required> <required>false</required>
@ -690,7 +693,7 @@
<type>DependencyManagement</type> <type>DependencyManagement</type>
</association> </association>
</field> </field>
<field> <field xdoc.separator="blank">
<name>properties</name> <name>properties</name>
<version>4.0.0</version> <version>4.0.0</version>
<description> <description>

9
maven-plugin-api/src/main/mdo/lifecycle.mdo
View File

@ -17,7 +17,10 @@ specific language governing permissions and limitations
under the License. under the License.
--> -->
<model> <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/LIFECYCLE/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/lifecycle-${version}.xsd">
<id>lifecycle-mappings</id> <id>lifecycle-mappings</id>
<name>LifecycleMappings</name> <name>LifecycleMappings</name>
<description><![CDATA[ <description><![CDATA[
@ -35,10 +38,10 @@ under the License.
<version>1.0.0</version> <version>1.0.0</version>
<description>Root element of the lifecycle.xml file.</description> <description>Root element of the lifecycle.xml file.</description>
<fields> <fields>
<field xml.listStyle="flat"> <field>
<name>lifecycles</name> <name>lifecycles</name>
<version>1.0.0</version> <version>1.0.0</version>
<association> <association xml.itemsStyle="flat">
<type>Lifecycle</type> <type>Lifecycle</type>
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>

6
maven-project/src/main/mdo/profiles.mdo
View File

@ -17,8 +17,10 @@ specific language governing permissions and limitations
under the License. under the License.
--> -->
<model xsd.namespace="http://maven.apache.org/PROFILES/1.0.0" <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsd.target-namespace="http://maven.apache.org/PROFILES/1.0.0"> xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/PROFILES/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/profiles-${version}.xsd">
<id>profiles</id> <id>profiles</id>
<name>Profiles</name> <name>Profiles</name>
<description><![CDATA[ <description><![CDATA[

10
maven-toolchain/src/main/mdo/toolchains.xml
View File

@ -19,8 +19,10 @@
under the License. under the License.
--> -->
<model xsd.namespace="http://maven.apache.org/TOOLCHAINS/1.0.0" <model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsd.target-namespace="http://maven.apache.org/TOOLCHAINS/1.0.0"> xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/TOOLCHAINS/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/toolchains-${version}.xsd">
<id>maven-toolchains</id> <id>maven-toolchains</id>
<name>MavenToolchains</name> <name>MavenToolchains</name>
<description><![CDATA[ <description><![CDATA[
@ -41,11 +43,11 @@
]]></description> ]]></description>
<version>1.0.0+</version> <version>1.0.0+</version>
<fields> <fields>
<field xml.listStyle="flat"> <field>
<name>toolchains</name> <name>toolchains</name>
<version>1.0.0+</version> <version>1.0.0+</version>
<description><![CDATA[The toolchain definition.]]></description> <description><![CDATA[The toolchain definition.]]></description>
<association> <association xml.itemsStyle="flat">
<type>ToolchainModel</type> <type>ToolchainModel</type>
<multiplicity>*</multiplicity> <multiplicity>*</multiplicity>
</association> </association>