commit 4fe0a41319e971d5100e12f2c9a57415b108d08d
author Michael Osipov <michaelo@apache.org> Sat May 14 22:48:06 2016 +0000
committer Michael Osipov <michaelo@apache.org> Sat May 14 22:48:06 2016 +0000
tree a4b186cf5de830a6ed72fdf90e82a03eb5ae3960
parent 1b545b3f1e15ce6fccbc7b2b223785307ce01fb0

[MASSEMBLY-745] Give the component format schema file a better name

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1743866 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 049d8f0..37daed1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,8 +265,8 @@
         <configuration>
           <version>${mdoVersion}</version>
           <models>
-            <model>src/main/mdo/descriptor.mdo</model>
-            <model>src/main/mdo/component.mdo</model>
+            <model>src/main/mdo/assembly.mdo</model>
+            <model>src/main/mdo/assembly-component.mdo</model>
           </models>
         </configuration>
         <executions>

src/main/mdo/assembly-component.mdo

diff --git a/src/main/mdo/component.mdo b/src/main/mdo/assembly-component.mdo
similarity index 99%
rename from src/main/mdo/component.mdo
rename to src/main/mdo/assembly-component.mdo
index 883ebda..ff5aa53 100644
--- a/src/main/mdo/component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -24,9 +24,9 @@
 <model xmlns="http://codehaus-plexus.github.io/MODELLO/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.8.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.8.0.xsd"
        xml.namespace="http://maven.apache.org/ASSEMBLY-COMPONENT/${version}"
-       xml.schemaLocation="http://maven.apache.org/xsd/component-${version}.xsd">
+       xml.schemaLocation="http://maven.apache.org/xsd/assembly-component-${version}.xsd">
 
-  <id>component</id>
+  <id>assembly-component</id>
   <name>Component</name>
   <description>
     <![CDATA[

src/main/mdo/assembly.mdo

diff --git a/src/main/mdo/descriptor.mdo b/src/main/mdo/assembly.mdo
similarity index 100%
rename from src/main/mdo/descriptor.mdo
rename to src/main/mdo/assembly.mdo

src/site/apt/index.apt.vm

diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index e6656f7..39d4039 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -122,7 +122,7 @@
 * Assembly and Component Descriptor Schemas (XSD)
 
   * {{{http://maven.apache.org/xsd/assembly-2.0.0.xsd}http://maven.apache.org/xsd/assembly-2.0.0.xsd}},
-    {{{http://maven.apache.org/xsd/component-2.0.0.xsd}http://maven.apache.org/xsd/component-2.0.0.xsd}} (for version 3.0 and higher)
+    {{{http://maven.apache.org/xsd/assembly-component-2.0.0.xsd}http://maven.apache.org/xsd/assembly-component-2.0.0.xsd}} (for version 3.0 and higher)
 
   * {{{http://maven.apache.org/xsd/assembly-1.1.3.xsd}http://maven.apache.org/xsd/assembly-1.1.3.xsd}},
     {{{http://maven.apache.org/xsd/component-1.1.3.xsd}http://maven.apache.org/xsd/component-1.1.3.xsd}} (for version 2.5.4 and higher)