diff --git a/javadoc/project.xml b/javadoc/project.xml
index a191998e..8e89a9b9 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -1,159 +1,151 @@
-
-
-
-
- ../plugin-parent/project.xml
- 3
- maven-javadoc-plugin
- Maven Javadoc Plug-in
- 1.7-SNAPSHOT
-
- Produce Javadocs and report
- http://maven.apache.org/reference/plugins/javadoc/
- http://jira.codehaus.org/browse/MPJAVADOC
- /www/maven.apache.org/reference/plugins/javadoc/
-
- scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/javadoc/
- scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/javadoc/
- http://cvs.apache.org/viewcvs/maven-plugins/javadoc/
-
-
-
- 1.3
- 1.3
- MAVEN_JAVADOC_1_3
-
-
- 1.4
- 1.4
- MAVEN_JAVADOC_1_4
-
-
- 1.5
- 1.5
- MAVEN_JAVADOC_1_5
-
-
- 1.6
- 1.6
- MAVEN_JAVADOC_1_6
-
-
- 1.6.1
- 1.6.1
- MAVEN_JAVADOC_1_6_1
-
-
-
-
- Emmanuel Venisse
- evenisse
- emmanuel@venisse.net
-
-
- Java Developer
-
-
-
- Stephane Mor
- smor
- stephanemor@yahoo.fr
- Hasgard Systemes et Reseaux
-
- Java Developer
-
-
-
- Jason van Zyl
- jvanzyl
- jason@zenplex.com
- Zenplex
-
- Architect
-
-
-
- Michal Maczka
- michal
- michal.maczka@dimatics.com
- Dimatics
-
- Jelly Developer
-
-
-
- Vincent Massol
- vmassol
- vmassol@pivolis.com
- Pivolis
-
- Java Developer
-
-
-
- Arnaud Heritier
- aheritier
- aheritier@apache.org
-
- Developer
- Release Manager
-
-
-
-
-
- commons-lang
- commons-lang
- 2.0
-
-
-
- src/main
- src/test
-
-
- **/*Test.java
-
-
-
- src/test
-
- **/*.txt
-
-
-
-
-
-
- ${basedir}/src/plugin-resources
- plugin-resources
-
-
- ${basedir}
-
- plugin.jelly
- plugin.properties
- project.properties
- project.xml
-
-
-
-
-
+ ../plugin-parent/project.xml
+ 3
+ maven-javadoc-plugin
+ Maven Javadoc Plug-in
+ maven-javadoc-plugin
+ 1.7-SNAPSHOT
+ Produce Javadocs and report
+ http://maven.apache.org/reference/plugins/javadoc/
+ http://jira.codehaus.org/browse/MPJAVADOC
+ /www/maven.apache.org/reference/plugins/javadoc/
+
+ scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/javadoc/
+ scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/javadoc/
+ http://cvs.apache.org/viewcvs/maven-plugins/javadoc/
+
+
+
+ 1.3
+ 1.3
+ MAVEN_JAVADOC_1_3
+
+
+ 1.4
+ 1.4
+ MAVEN_JAVADOC_1_4
+
+
+ 1.5
+ 1.5
+ MAVEN_JAVADOC_1_5
+
+
+ 1.6
+ 1.6
+ MAVEN_JAVADOC_1_6
+
+
+ 1.6.1
+ 1.6.1
+ MAVEN_JAVADOC_1_6_1
+
+
+
+
+ Emmanuel Venisse
+ evenisse
+ emmanuel@venisse.net
+
+ Java Developer
+
+
+
+ Stephane Mor
+ smor
+ stephanemor@yahoo.fr
+ Hasgard Systemes et Reseaux
+
+ Java Developer
+
+
+
+ Jason van Zyl
+ jvanzyl
+ jason@zenplex.com
+ Zenplex
+
+ Architect
+
+
+
+ Michal Maczka
+ michal
+ michal.maczka@dimatics.com
+ Dimatics
+
+ Jelly Developer
+
+
+
+ Vincent Massol
+ vmassol
+ vmassol@pivolis.com
+ Pivolis
+
+ Java Developer
+
+
+
+ Arnaud Heritier
+ aheritier
+ aheritier@apache.org
+
+ Developer
+ Release Manager
+
+
+
+
+
+ commons-lang
+ commons-lang
+ 2.0
+ jar
+
+
+
+ commons-collections
+ commons-collections
+ 3.1
+ jar
+
+
+
+
+ src/main
+ src/test
+
+
+ **/*Test.java
+
+
+
+ src/test
+
+ **/*.txt
+
+ false
+
+
+
+
+
+ ${basedir}/src/plugin-resources
+ plugin-resources
+ false
+
+
+ ${basedir}
+
+ plugin.jelly
+ plugin.properties
+ project.properties
+ project.xml
+
+ false
+
+
+
+
+
\ No newline at end of file
diff --git a/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java b/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
index 5e8d355b..3dc02836 100644
--- a/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
+++ b/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
@@ -17,9 +17,6 @@ package org.apache.maven.javadoc;
* ====================================================================
*/
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
@@ -29,21 +26,23 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
-
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import org.apache.commons.collections.set.ListOrderedSet;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
/**
* Converts the javadoc warnings into an xml (xdoc format) file.
*
* @author Steven Caswell (stevencaswell at apache.org)
- * @version $Id: JavadocWarningsTextToXml.java,v 1.2 2004/09/02 03:37:21 felipeal Exp $
+ * @version $Id: JavadocWarningsTextToXml.java,v 1.3 2004/09/03 22:25:03 aheritier Exp $
*/
public class JavadocWarningsTextToXml {
//~ Static fields/initializers ----------------------------------------------
@@ -279,7 +278,8 @@ public class JavadocWarningsTextToXml {
Set lineMessages = (Set) fileMessages.get(new Integer(lineNumber));
if (lineMessages == null) {
- lineMessages = new LinkedHashSet();
+ lineMessages = new ListOrderedSet();
+
fileMessages.put(
new Integer(lineNumber),
lineMessages