You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/03/13 23:55:59 UTC
svn commit: r922684 - in /maven/archetype/trunk/archetype-common: pom.xml
src/main/mdo/archetype-catalog.mdo src/main/mdo/archetype-common.mdo
src/main/mdo/archetype-descriptor.mdo src/main/mdo/archetype-registry.mdo
src/main/mdo/archetype.mdo
Author: hboutemy
Date: Sat Mar 13 22:55:58 2010
New Revision: 922684
URL: http://svn.apache.org/viewvc?rev=922684&view=rev
Log:
prepared Modello upgrade
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo
maven/archetype/trunk/archetype-common/src/main/mdo/archetype-common.mdo
maven/archetype/trunk/archetype-common/src/main/mdo/archetype-descriptor.mdo
maven/archetype/trunk/archetype-common/src/main/mdo/archetype-registry.mdo
maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=922684&r1=922683&r2=922684&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Sat Mar 13 22:55:58 2010
@@ -181,7 +181,9 @@ under the License.
</goals>
<configuration>
<version>1.0.0</version>
- <model>src/main/mdo/archetype-common.mdo</model>
+ <models>
+ <model>src/main/mdo/archetype-common.mdo</model>
+ </models>
</configuration>
</execution>
<execution>
@@ -194,7 +196,9 @@ under the License.
</goals>
<configuration>
<version>1.0.0</version>
- <model>src/main/mdo/archetype-registry.mdo</model>
+ <models>
+ <model>src/main/mdo/archetype-registry.mdo</model>
+ </models>
</configuration>
</execution>
<execution>
@@ -207,7 +211,9 @@ under the License.
</goals>
<configuration>
<version>1.0.0</version>
- <model>src/main/mdo/archetype-descriptor.mdo</model>
+ <models>
+ <model>src/main/mdo/archetype-descriptor.mdo</model>
+ </models>
</configuration>
</execution>
<execution>
@@ -220,7 +226,9 @@ under the License.
</goals>
<configuration>
<version>1.0.0</version>
- <model>src/main/mdo/archetype-catalog.mdo</model>
+ <models>
+ <model>src/main/mdo/archetype-catalog.mdo</model>
+ </models>
</configuration>
</execution>
<execution>
@@ -233,7 +241,9 @@ under the License.
</goals>
<configuration>
<version>1.0.0</version>
- <model>src/main/mdo/archetype.mdo</model>
+ <models>
+ <model>src/main/mdo/archetype.mdo</model>
+ </models>
</configuration>
</execution>
</executions>
Modified: maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo?rev=922684&r1=922683&r2=922684&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo (original)
+++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo Sat Mar 13 22:55:58 2010
@@ -18,7 +18,9 @@
~ under the License.
-->
<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">
+ 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/plugins/maven-archetype-plugin/archetype-catalog/${version}"
+ xml.schemaLocation="http://maven.apache.org/xsd/archetype-catalog-${version}.xsd">
<id>archetype-catalog</id>
<name>ArchetypeCatalog</name>
<description>
@@ -57,6 +59,7 @@
</codeSegment>
</codeSegments>
</class>
+
<class>
<name>Archetype</name>
<fields>
Modified: maven/archetype/trunk/archetype-common/src/main/mdo/archetype-common.mdo
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype-common.mdo?rev=922684&r1=922683&r2=922684&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/mdo/archetype-common.mdo (original)
+++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype-common.mdo Sat Mar 13 22:55:58 2010
@@ -18,7 +18,9 @@
~ under the License.
-->
<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">
+ 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/plugins/maven-archetype-plugin/archetype-common/${version}"
+ xml.schemaLocation="http://maven.apache.org/xsd/archetype-common-${version}.xsd">
<id>archetype-common</id>
<name>ArchetypeCommon</name>
Modified: maven/archetype/trunk/archetype-common/src/main/mdo/archetype-descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype-descriptor.mdo?rev=922684&r1=922683&r2=922684&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/mdo/archetype-descriptor.mdo (original)
+++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype-descriptor.mdo Sat Mar 13 22:55:58 2010
@@ -18,7 +18,9 @@
~ under the License.
-->
<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">
+ 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/plugins/maven-archetype-plugin/archetype-descriptor/${version}"
+ xml.schemaLocation="http://maven.apache.org/xsd/archetype-descriptor-${version}.xsd">
<id>archetype-descriptor</id>
<name>ArchetypeDescriptor</name>
@@ -28,6 +30,7 @@
<value>org.apache.maven.archetype.metadata</value>
</default>
</defaults>
+
<classes>
<class rootElement="true" xml.tagName="archetype-descriptor">
<name>ArchetypeDescriptor</name>
Modified: maven/archetype/trunk/archetype-common/src/main/mdo/archetype-registry.mdo
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype-registry.mdo?rev=922684&r1=922683&r2=922684&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/mdo/archetype-registry.mdo (original)
+++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype-registry.mdo Sat Mar 13 22:55:58 2010
@@ -18,7 +18,9 @@
~ under the License.
-->
<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">
+ 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/plugins/maven-archetype-plugin/archetype-registry/${version}"
+ xml.schemaLocation="http://maven.apache.org/xsd/archetype-registry-${version}.xsd">
<id>archetype-registry</id>
<name>ArchetypeRegistry</name>
Modified: maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo?rev=922684&r1=922683&r2=922684&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo (original)
+++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo Sat Mar 13 22:55:58 2010
@@ -3,16 +3,20 @@
<!-- START SNIPPET: modello-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">
+ 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/plugins/maven-archetype-plugin/archetype/${version}"
+ xml.schemaLocation="http://maven.apache.org/xsd/archetype-${version}.xsd">
<id>archetype</id>
<name>Archetype</name>
<description><![CDATA[Maven's model for the archetype descriptor.]]></description>
+
<defaults>
<default>
<key>package</key>
<value>org.apache.maven.archetype.model</value>
</default>
</defaults>
+
<classes>
<class rootElement="true" xml.tagName="archetype">
<name>ArchetypeModel</name>