You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/10/18 19:21:12 UTC

svn commit: r326173 - in /maven/maven-1/plugins/trunk/xdoc: plugin.properties project.properties src/dtd/maven-xdoc.dtd src/plugin-resources/dtd/maven-xdoc-1.10.dtd

Author: ltheussl
Date: Tue Oct 18 10:21:07 2005
New Revision: 326173

URL: http://svn.apache.org/viewcvs?rev=326173&view=rev
Log:
Remove 'goals' from validation: should be done by plugin plugin

Modified:
    maven/maven-1/plugins/trunk/xdoc/plugin.properties
    maven/maven-1/plugins/trunk/xdoc/project.properties
    maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd
    maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd

Modified: maven/maven-1/plugins/trunk/xdoc/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/plugin.properties?rev=326173&r1=326172&r2=326173&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.properties Tue Oct 18 10:21:07 2005
@@ -81,8 +81,8 @@
 maven.xdoc.copy.excludes.classic=external-classic.png,help_logo.gif,icon_arrowfolderclosed1_sml.gif,icon_arrowwaste1_sml.gif,icon_arrowwaste2_sml.gif,icon_doc_lrg.gif,icon_doc_sml.gif,icon_error_lrg.gif,icon_folder_lrg.gif,icon_folder_sml.gif,icon_help_sml.gif,icon_info_lrg.gif,icon_members_lrg.gif,icon_sortdown.gif,icon_sortup.gif,icon_success_lrg.gif,icon_usergroups_lrg.gif,icon_arrowfolderopen2_sml.gif,icon_warning_lrg.gif,newwindow-classic.png,nw_maj_rond.gif,strich.gif,sw_maj_rond.gif,sw_med_rond.gif
 
 # List of xml files (or patterns) to exclude from validation
-# Note that navigation.xml and ${maven.xdoc.xml.copy} are included implicitly
-maven.xdoc.validate.exclude=changes.xml
+# Note that navigation.xml and ${maven.xdoc.xml.copy} are excluded implicitly
+maven.xdoc.validate.exclude=changes.xml,goals.xml
 
 maven.xdoc.skip.uptodate=false
 

Modified: maven/maven-1/plugins/trunk/xdoc/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/project.properties?rev=326173&r1=326172&r2=326173&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.properties (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.properties Tue Oct 18 10:21:07 2005
@@ -19,4 +19,3 @@
 # -------------------------------------------------------------------
 maven.junit.fork=yes
 maven.compile.encoding=UTF-8
-maven.xdoc.validate.exclude=changes.xml

Modified: maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd?rev=326173&r1=326172&r2=326173&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd Tue Oct 18 10:21:07 2005
@@ -412,7 +412,7 @@
 
 <!--=================== Document Body ====================================-->
 
-<!ELEMENT body ((section | goals)+, navbar?)>
+<!ELEMENT body (section+, navbar?)>
 <!ATTLIST body
   %attrs;
   onload      %Script;       #IMPLIED
@@ -1206,11 +1206,6 @@
 
 <!ELEMENT escapeXml ANY>
 <!ELEMENT source (#PCDATA | escapeXml)*>
-<!ELEMENT goals (goal)+>
-
-<!ELEMENT goal (name, description)>
-<!ELEMENT name %Flow;>
-<!ELEMENT description %Flow;>
 
 <!ELEMENT section (%block.section;)*>
 <!ATTLIST section

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd?rev=326173&r1=326172&r2=326173&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd Tue Oct 18 10:21:07 2005
@@ -412,7 +412,7 @@
 
 <!--=================== Document Body ====================================-->
 
-<!ELEMENT body ((section | goals)+, navbar?)>
+<!ELEMENT body (section+, navbar?)>
 <!ATTLIST body
   %attrs;
   onload      %Script;       #IMPLIED
@@ -1206,11 +1206,6 @@
 
 <!ELEMENT escapeXml ANY>
 <!ELEMENT source (#PCDATA | escapeXml)*>
-<!ELEMENT goals (goal)+>
-
-<!ELEMENT goal (name, description)>
-<!ELEMENT name %Flow;>
-<!ELEMENT description %Flow;>
 
 <!ELEMENT section (%block.section;)*>
 <!ATTLIST section