From 469c7467a3e2bdcedb2d44224215ffdc4a2b44b0 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 25 May 2006 06:30:57 +0000
Subject: [PATCH] PR : MPLINKCHECK-27 Submitted by : Dennis Lundberg Maven
 1.0.x incompatibility problem : The report is incomplete if one or more files
 has errors in them The test added doesn't yet fails if there's a problem This
 test isn't actually executed in maven 1.1 because of MAVEN-1638

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@409311 13f79535-47bb-0310-9956-ffa450edef68
---
 linkcheck/project.xml                         |  2 +-
 linkcheck/src/plugin-resources/linkcheck.jsl  |  4 +-
 .../src/plugin-test/defaultTest/project.xml   | 20 +++---
 linkcheck/src/plugin-test/maven.xml           | 28 ++++++++
 linkcheck/src/plugin-test/project.xml         | 65 +++++++++++++++++++
 .../testEmptyReportWithMaven1.0/maven.xml     | 27 ++++++++
 .../testEmptyReportWithMaven1.0/project.xml   | 12 ++++
 .../xdocs/navigation.xml                      |  9 +++
 linkcheck/xdocs/changes.xml                   |  3 +
 9 files changed, 156 insertions(+), 14 deletions(-)
 create mode 100644 linkcheck/src/plugin-test/maven.xml
 create mode 100644 linkcheck/src/plugin-test/project.xml
 create mode 100644 linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml
 create mode 100644 linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/project.xml
 create mode 100644 linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/xdocs/navigation.xml

diff --git a/linkcheck/project.xml b/linkcheck/project.xml
index 7694510d..d4a92d98 100644
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-linkcheck-plugin</id>
   <name>Maven LinkCheck Plugin</name>
-  <currentVersion>1.4</currentVersion>
+  <currentVersion>1.4.1-SNAPSHOT</currentVersion>
   <description>Check xdoc links. Requires Maven 1.0 RC2.</description>
   <shortDescription>Check xdoc links</shortDescription>
   <versions>
diff --git a/linkcheck/src/plugin-resources/linkcheck.jsl b/linkcheck/src/plugin-resources/linkcheck.jsl
index dee69b3a..7f2c9da3 100644
--- a/linkcheck/src/plugin-resources/linkcheck.jsl
+++ b/linkcheck/src/plugin-resources/linkcheck.jsl
@@ -36,7 +36,7 @@
         <section name="Link Check Report">
           <p><b><span style="color:#00AA00;text-align:right"><x:expr select="count(file)"/> </span></b> file(s) and <b><span style="color:#00AA00;text-align:right"><x:expr select="sum(file/unsuccessful)+sum(file/successful)"/> </span></b> link(s) checked. <b><span style="color:#FF0000;text-align:right"><x:expr select="count(file/result[status='error'])"/></span></b> error(s) and <b><span style="color:#FFA916;text-align:right"><x:expr select="count(file/result[status='warning'])"/></span></b> warning(s) reported in <b><span style="color:#00AA00;text-align:right"><x:expr select="count(file[unsuccessful!=0])"/> </span></b> file(s).</p>
           <j:set var="nbFilesInError"><x:expr select="count(file[unsuccessful!=0])"/></j:set>
-          <j:if test="${nbFilesInError gt 0}">
+          <j:if test="${nbFilesInError != '0'}">
           <table summary="Link Check summary">
             <thead>
               <tr>
@@ -82,4 +82,4 @@
       </body>
     </document>
   </jsl:template>
-</jsl:stylesheet>
\ No newline at end of file
+</jsl:stylesheet>
diff --git a/linkcheck/src/plugin-test/defaultTest/project.xml b/linkcheck/src/plugin-test/defaultTest/project.xml
index 26992bcd..6e76392f 100644
--- a/linkcheck/src/plugin-test/defaultTest/project.xml
+++ b/linkcheck/src/plugin-test/defaultTest/project.xml
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
   </organization>
-  <inceptionYear>2004</inceptionYear>
+  <inceptionYear>2006</inceptionYear>
   <package>org.apache.maven</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>Test for Maven Linkcheck plugin</description>
@@ -36,16 +36,17 @@
   <url>http://maven.apache.org/maven-1.x/plugins/linkcheck/</url>
   <siteDirectory>/www/maven.apache.org/maven-1.x/plugins/linkcheck/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/linkcheck/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/linkcheck/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/linkcheck/</connection>
+    <url>http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/linkcheck//</url>
   </repository>
   <developers>
     <developer>
-      <name>Carlos Sanchez</name>
-      <id>carlos</id>
-      <email>carlos@apache.org</email>
+      <name>Arnaud Heritier</name>
+      <id>aheritier</id>
+      <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
-        <role>Java Developer</role>
+        <role>Developer</role>
       </roles>
     </developer>
   </developers>
@@ -53,7 +54,4 @@
   </dependencies>
   <build>
   </build>
-  <reports>
-    <report>maven-linkcheck-plugin</report>
-  </reports>
 </project>
diff --git a/linkcheck/src/plugin-test/maven.xml b/linkcheck/src/plugin-test/maven.xml
new file mode 100644
index 00000000..eae49a53
--- /dev/null
+++ b/linkcheck/src/plugin-test/maven.xml
@@ -0,0 +1,28 @@
+<!-- 
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project xmlns:maven="jelly:maven">
+         
+  <goal name="testPlugin">
+    <maven:reactor basedir="${basedir}"
+      includes="*/project.xml"
+      goals="testPlugin"
+      banner="Test"
+      ignoreFailures="false"/>
+  </goal>
+  
+</project>
\ No newline at end of file
diff --git a/linkcheck/src/plugin-test/project.xml b/linkcheck/src/plugin-test/project.xml
new file mode 100644
index 00000000..852ff113
--- /dev/null
+++ b/linkcheck/src/plugin-test/project.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+
+<project>
+  <pomVersion>3</pomVersion>
+  <id>test-maven-javadoc-plugin</id>
+  <name>Tests project for Maven JavaDoc Plugin</name>
+  <groupId>maven</groupId>
+  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
+  </organization>
+  <inceptionYear>2001</inceptionYear>
+  <package>org.apache</package>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
+  <description>Tests for Maven JavaDoc plugin</description>
+  <shortDescription>Tests for Maven JavaDoc plugin</shortDescription>
+  <url>http://maven.apache.org/maven-1.x/plugins/javadoc/index.html</url>
+  <siteDirectory>/www/maven.apache.org/maven-1.x/plugins/javadoc/</siteDirectory>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/javadoc/</connection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/javadoc/</url>
+  </repository>
+  <developers>
+    <developer>
+      <name>dIon Gillard</name>
+      <id>dion</id>
+      <email>dion@multitask.com.au</email>
+      <organization>Multitask Consulting</organization>
+      <roles>
+        <role>Documentation</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Arnaud Heritier</name>
+      <id>aheritier</id>
+      <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <build/>
+</project>
\ No newline at end of file
diff --git a/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml
new file mode 100644
index 00000000..8ee27906
--- /dev/null
+++ b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml
@@ -0,0 +1,27 @@
+<!-- 
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project xmlns:util="jelly:util" xmlns:j="jelly:core">
+         
+  <goal name="testPlugin" prereqs="test-linkcheck">
+  </goal>
+  
+  <goal name="test-linkcheck" prereqs="clean">
+    <attainGoal name="site"/>
+  </goal>
+
+</project>
\ No newline at end of file
diff --git a/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/project.xml b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/project.xml
new file mode 100644
index 00000000..fd3787da
--- /dev/null
+++ b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/project.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <pomVersion>3</pomVersion>
+  <name>MPLINKCHECK-27</name>
+  <groupId>org.apache.maven.plugins.linkcheck</groupId>
+  <artifactId>MPLINKCHECK-27</artifactId>
+  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <description>Maven 1.0.x : The report is incomplete if one or more files has errors in them.</description>
+  <reports>
+    <report>maven-linkcheck-plugin</report>
+  </reports>
+</project>
diff --git a/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/xdocs/navigation.xml b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/xdocs/navigation.xml
new file mode 100644
index 00000000..83a8233e
--- /dev/null
+++ b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/xdocs/navigation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="MPLINKCHECK-27">
+  <title>MPLINKCHECK-27</title>
+  <body>
+    <menu name="Menu">
+      <item name="Broken link" href="/broken_link.html" />
+    </menu>
+  </body>
+</project>
diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml
index 8cfcceaa..b3f789ea 100644
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="aheritier@apahce.org">Arnaud Heritier</author>
   </properties>
   <body>
+    <release version="1.4.1-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix" issue="MPLINKCHECK-27" due-to="Dennis Lundberg">Maven 1.0.x : The report is incomplete if one or more files has errors in them.</action>
+    </release>
     <release version="1.4" date="2006-04-27">
       <action dev="aheritier" type="update" issue="MAVEN-1759">Upgrade to log4j 1.2.13.</action>
       <action dev="aheritier" type="add">Add the property "maven.linkcheck.method" to select the method to use to do the tests (head -by default-,or get).</action>