Return-Path: 
 <commits-return-32920-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: (qmail 50221 invoked from network); 5 Feb 2011 01:30:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 5 Feb 2011 01:30:36 -0000
Received: (qmail 64283 invoked by uid 500); 5 Feb 2011 01:30:36 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 64157 invoked by uid 500); 5 Feb 2011 01:30:36 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 64149 invoked by uid 99); 5 Feb 2011 01:30:36 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Feb 2011 01:30:36 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Feb 2011 01:30:33 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A497023889CB; Sat,  5 Feb 2011 01:30:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1067372 - in
 /maven/plugins/trunk/maven-assembly-plugin/src/main/mdo: component.mdo
 descriptor.mdo
Date: Sat, 05 Feb 2011 01:30:12 -0000
To: commits@maven.apache.org
From: hboutemy@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110205013012.A497023889CB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>