Re: validate script and Maven 2

[Leo Simons]

Hi Roland,

Patch applied, thanks!

(I also added some attributes for <nant/> while I was there.)

cheers,

- Leo

On Dec 30, 2007, at 9:25 AM, Roland Weber wrote:

Index: dtd/project.dtd
===================================================================
--- dtd/project.dtd     (revision 607521)
+++ dtd/project.dtd     (working copy)
@@ -22,10 +22,11 @@
     +-->

 <!ELEMENT module      ( url | description | nag | cvs | svn | p4 |
redistributable | project )* >

-<!ELEMENT project ( ant | maven | nant | script | configure | make +<!ELEMENT project ( ant | maven | mvn | nant | script | configure | make | package | mkdir | depend | option | home | jar | delete | description |

work | license | nag | url | javadoc | junitreport | redistributable |
xmlreport )* >

<!ELEMENT ant ( property | depend | sysproperty | mkdir | jvmarg )* >

 <!ELEMENT maven       ( property | depend )* >
+<!ELEMENT mvn         ( property | depend )* >
 <!ELEMENT nag         ( regexp )* >
 <!ELEMENT javadoc     ( description )* >
 <!ELEMENT junitreport ( description )* >
@@ -81,6 +82,11 @@
   basedir   CDATA #IMPLIED
   goal      CDATA #IMPLIED >

+<!ATTLIST mvn
+  buildfile CDATA #IMPLIED
+  basedir   CDATA #IMPLIED
+  goal      CDATA #IMPLIED >
+
 <!ATTLIST script
   name      CDATA #IMPLIED
   basedir   CDATA #IMPLIED>
@@ -94,6 +100,8 @@
   basedir   CDATA #IMPLIED>

 <!ATTLIST depend
+  artifactId CDATA #IMPLIED
+  groupId    CDATA #IMPLIED
   id        CDATA #IMPLIED
   ids       CDATA #IMPLIED
   inherit   CDATA #IMPLIED
Index: dtd/project.dtd
===================================================================
--- dtd/project.dtd     (revision 607521)
+++ dtd/project.dtd     (working copy)
@@ -22,10 +22,11 @@
     +-->

<!ELEMENT module ( url | description | nag | cvs | svn | p4 | redistributable | project )* > -<!ELEMENT project ( ant | maven | nant | script | configure | make +<!ELEMENT project ( ant | maven | mvn | nant | script | configure | make | package | mkdir | depend | option | home | jar | delete | description | work | license | nag | url | javadoc | junitreport | redistributable | xmlreport )* > <!ELEMENT ant ( property | depend | sysproperty | mkdir | jvmarg )* >

 <!ELEMENT maven       ( property | depend )* >
+<!ELEMENT mvn         ( property | depend )* >
 <!ELEMENT nag         ( regexp )* >
 <!ELEMENT javadoc     ( description )* >
 <!ELEMENT junitreport ( description )* >
@@ -81,6 +82,11 @@
   basedir   CDATA #IMPLIED
   goal      CDATA #IMPLIED >

+<!ATTLIST mvn
+  buildfile CDATA #IMPLIED
+  basedir   CDATA #IMPLIED
+  goal      CDATA #IMPLIED >
+
 <!ATTLIST script
   name      CDATA #IMPLIED
   basedir   CDATA #IMPLIED>
@@ -94,6 +100,8 @@
   basedir   CDATA #IMPLIED>

 <!ATTLIST depend
+  artifactId CDATA #IMPLIED
+  groupId    CDATA #IMPLIED
   id        CDATA #IMPLIED
   ids       CDATA #IMPLIED
   inherit   CDATA #IMPLIED

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]