Author: hboutemy
Date: Sat Feb 5 01:30:12 2011
New Revision: 1067372
URL: http://svn.apache.org/viewvc?rev=1067372&view=rev
Log:
o added Modello xsd reference to *.mdo descriptors
o use ${version} instead of hardcoded 1.1.2 version in target xsd
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=1067372&r1=1067371&r2=1067372&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Sat
Feb 5 01:30:12 2011
@@ -17,12 +17,14 @@
-->
<!-- Note Definitions of FileSet, FileItem, and DependencySet are
- already defined in descriptor.mod, but repeated here since
+ already defined in descriptor.mdo, but repeated here since
Modello currently does not have capability to share files
-->
-<model
xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2";
-
xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2";>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0
http://modello.codehaus.org/xsd/modello-1.4.0.xsd";
+
xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/${version}";
+
xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/${version}";>
<id>component</id>
<name>Component</name>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=1067372&r1=1067371&r2=1067372&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Sat
Feb 5 01:30:12 2011
@@ -17,14 +17,16 @@
-->
<!--
- Since modello does not have the capability to share descriptor,
- If you make changes to FileSet, FileItem, DependendencySet, or
+ Since Modello does not have the capability to share descriptor,
+ if you make changes to FileSet, FileItem, DependendencySet, or
adding new collection, make sure to propagate your changes
to "component.mdo".
-->
-<model
xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
-
xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0
http://modello.codehaus.org/xsd/modello-1.4.0.xsd";
+
xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${version}";
+
xsd.targetNamespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/${version}";>
<id>assembly</id>
<name>Assembly</name>
