Author: hboutemy Date: Sun Mar 1 00:30:42 2009 New Revision: 748943 URL: http://svn.apache.org/viewvc?rev=748943&view=rev Log: added Modello XML Schema reference to models
Modified: 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/src/main/mdo/archetype-catalog.mdo URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo?rev=748943&r1=748942&r2=748943&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 Sun Mar 1 00:30:42 2009 @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ 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"> <id>archetype-catalog</id> <name>ArchetypeCatalog</name> <description> @@ -122,10 +123,10 @@ { return false; } - else + else { Archetype a = (Archetype) object; - return org.codehaus.plexus.util.StringUtils.equals( groupId, a.getGroupId () ) && + return org.codehaus.plexus.util.StringUtils.equals( groupId, a.getGroupId () ) && org.codehaus.plexus.util.StringUtils.equals( artifactId, a.getArtifactId () ); } } 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=748943&r1=748942&r2=748943&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 Sun Mar 1 00:30:42 2009 @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ 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"> <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=748943&r1=748942&r2=748943&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 Sun Mar 1 00:30:42 2009 @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ 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"> <id>archetype-descriptor</id> <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=748943&r1=748942&r2=748943&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 Sun Mar 1 00:30:42 2009 @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ 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"> <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=748943&r1=748942&r2=748943&view=diff ============================================================================== --- maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo (original) +++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo Sun Mar 1 00:30:42 2009 @@ -2,7 +2,8 @@ <!-- START SNIPPET: modello-model --> -<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"> <id>archetype</id> <name>Archetype</name> <description><![CDATA[Maven's model for the archetype descriptor.]]></description> @@ -28,7 +29,7 @@ <name>allowPartial</name> <version>1.0.0</version> <required>true</required> - <type>boolean</type> + <type>boolean</type> </field> <field> <name>sources</name> @@ -45,7 +46,7 @@ <type>String</type> <multiplicity>*</multiplicity> </association> - </field> + </field> <field> <name>testSources</name> <version>1.0.0</version> @@ -53,7 +54,7 @@ <type>String</type> <multiplicity>*</multiplicity> </association> - </field> + </field> <field> <name>testResources</name> <version>1.0.0</version> @@ -61,7 +62,7 @@ <type>String</type> <multiplicity>*</multiplicity> </association> - </field> + </field> <field> <name>siteResources</name> <version>1.0.0</version> @@ -69,7 +70,7 @@ <type>String</type> <multiplicity>*</multiplicity> </association> - </field> + </field> </fields> </class> </classes>