Add xml declaration to all xml generated report. Fixed for character encoding.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113614 13f79535-47bb-0310-9956-ffa450edef68
2003-07-08 11:01:08 +00:00 · 2003-07-08 11:01:08 +00:00 · 68daa1e923
commit 68daa1e923
parent 04da231ad9
21 changed files with 50 additions and 11 deletions
--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@ -381,7 +381,6 @@
      input="${maven.build.dir}/TESTS-TestSuites-Cactus.xml"
      output="cactus-report.xml"
      stylesheet="${plugin.resources}/cactus.jsl"
-      omitXmlDeclaration="true"
      outputMode="xml"
      prettyPrint="true"/>

--- a/cactus/xdocs/changes.xml
+++ b/cactus/xdocs/changes.xml
@ -8,6 +8,9 @@
  <body>

    <release version="3.0" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="epugh" type="add">
        Ability to optionally specify for Tomcat 4x and 5x a directory to which 
        the container will be installed for the tests.        
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@ -65,7 +65,6 @@
            output="changelog-report.xml"
            stylesheet="${plugin.resources}/changelog.jsl"
            encoding="${maven.docs.outputencoding}"
-            omitXmlDeclaration="false"
            outputMode="xml"
            prettyPrint="true"
            />
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@ -8,6 +8,9 @@

  <body>
    <release version="1.3" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="evenisse" type="fix" due-to="Bruce Chenoweth">
        Fixed MAVEN-425. Escape filename.
      </action>
--- a/changes/plugin.jelly
+++ b/changes/plugin.jelly
@ -39,7 +39,6 @@
        output="changes-report.xml"
        stylesheet="${plugin.resources}/changes.jsl"
        encoding="${maven.docs.outputencoding}"
-        omitXmlDeclaration="false"
        outputMode="xml"
        prettyPrint="true"
        />
--- a/changes/xdocs/changes.xml
+++ b/changes/xdocs/changes.xml
@ -7,6 +7,9 @@

  <body>
    <release version="1.2" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="vmassol" type="fix">
        Fixed the xdocs which were simply a copy of the changelog plugin
        docs.
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@ -152,7 +152,6 @@
        output="checkstyle-report.xml"
        stylesheet="${plugin.resources}/checkstyle.jsl"
        encoding="${maven.docs.outputencoding}"
-        omitXmlDeclaration="false"
        outputMode="xml"
        prettyPrint="true"/>

--- a/checkstyle/xdocs/changes.xml
+++ b/checkstyle/xdocs/changes.xml
@ -9,6 +9,9 @@
  <body>

    <release version="2.0" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="evenisse" type="fix">
        Fixed MAVEN-493. I register reports only if source, test,... exists.
        So, corresponding entrys in menu will appear only if reports are registered.
--- a/developer-activity/plugin.jelly
+++ b/developer-activity/plugin.jelly
@ -73,7 +73,6 @@
            output="developer-activity-report.xml"
            stylesheet="${plugin.resources}/developer-activity.jsl"
            encoding="${maven.docs.outputencoding}"
-            omitXmlDeclaration="false"
            outputMode="xml"
            prettyPrint="true"
          />
--- a/developer-activity/xdocs/changes.xml
+++ b/developer-activity/xdocs/changes.xml
@ -7,6 +7,9 @@

  <body>
 	<release version="1.3" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="evenisse" type="fix">
        Fixed MAVEN-493. I register reports only if source, test,... exists.
        So, corresponding entrys in menu will appear only if reports are registered.
--- a/file-activity/plugin.jelly
+++ b/file-activity/plugin.jelly
@ -82,7 +82,6 @@
            output="file-activity-report.xml"
            stylesheet="${plugin.resources}/${plugin.artifactId}.jsl"
            encoding="${maven.docs.outputencoding}"
-            omitXmlDeclaration="false"
            outputMode="xml"
            prettyPrint="true"
          />
--- a/file-activity/xdocs/changes.xml
+++ b/file-activity/xdocs/changes.xml
@ -7,6 +7,9 @@

  <body>
 	<release version="1.3" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="evenisse" type="fix">
        Fixed MAVEN-493. I register reports only if source, test,... exists.
        So, corresponding entrys in menu will appear only if reports are registered.
--- a/jdepend/plugin.jelly
+++ b/jdepend/plugin.jelly
@ -49,7 +49,6 @@
        input="${maven.build.dir}/jdepend-raw-report.xml"
        output="jdepend-report.xml"
        stylesheet="${plugin.resources}/jdepend.jsl"
-        omitXmlDeclaration="true"
        outputMode="xml"
        prettyPrint="true"
        />
--- a/jdepend/xdocs/changes.xml
+++ b/jdepend/xdocs/changes.xml
@ -7,6 +7,9 @@

  <body>
 	<release version="1.3" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="evenisse" type="fix">
        Fixed MAVEN-493. I register reports only if source, test,... exists.
        So, corresponding entrys in menu will appear only if reports are registered.
--- a/linkcheck/plugin.jelly
+++ b/linkcheck/plugin.jelly
@ -76,7 +76,6 @@
      input="${maven.build.dir}/linkcheck/linkcheck-results.xml"
      output="${maven.build.dir}/linkcheck/docs/linkcheck.xml"
      stylesheet="${plugin.resources}/linkcheck.jsl"
-      omitXmlDeclaration="true"
      outputMode="xml"
      prettyPrint="true"
      />
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@ -5,7 +5,7 @@
  <pomVersion>3</pomVersion>
  <id>maven-linkcheck-plugin</id>
  <name>Maven LinkCheck Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
  <description/>
  <shortDescription>Java Project Management Tools</shortDescription>
  <url>http://maven.apache.org/reference/plugins/linkcheck/</url>
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
+  </properties>
+
+  <body>
+	<release version="1.1" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
+    </release>
+  </body>
+</document>
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@ -95,7 +95,6 @@
      input="${maven.build.dir}/pmd-raw-report.xml"
      output="pmd-report.xml"
      stylesheet="${plugin.resources}/pmd.jsl"
-      omitXmlDeclaration="true"
      outputMode="xml"
      prettyPrint="true"
    />
--- a/pmd/xdocs/changes.xml
+++ b/pmd/xdocs/changes.xml
@ -9,6 +9,9 @@
  <body>

    <release version="1.1" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="vmassol" type="fix">
        Make sure the report does not fail if PMD does not detect any 
        violation. Fixes bug
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@ -88,6 +88,12 @@
       | @prettyPrint
      -->
 
+      <!-- Set default encoding if not set. -->
+      <j:if test="${encoding == null}">
+        <j:set var="encoding" 
+               value="${plugin.getVariable('maven.docs.outputencoding')}"/>
+      </j:if>
+      
      <util:file name="${input}" var="inputFile" />
      <x:parse var="doc" xml="${inputFile}"/>
      
@ -194,7 +200,7 @@
        </j:if>
      
      
-      <j:file name="${output}" prettyPrint="false" encoding="ISO-8859-1">         
+      <j:file name="${output}" prettyPrint="false" encoding="${encoding}">         
            <document>
              <properties><title>${title}</title></properties>
              <body>
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@ -7,6 +7,9 @@

  <body>
    <release version="1.4" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Add xml declaration to generated report. Fixed for character encoding.
+      </action>          
      <action dev="dion" type="add" due-to="Tim Anderson">
        Added the google search on navbar as per MAVEN-554
      </action>