aheritier 2004/09/03 15:25:03
Modified: javadoc project.xml
javadoc/src/main/org/apache/maven/javadoc
JavadocWarningsTextToXml.java
Log:
MPJAVADOC-44 : Cannot build the plugin with jdk 1.3
LinkedHashSet is replaced by ListOrderedSet (from commons collections)
Revision Changes Path
1.46 +150 -158 maven-plugins/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/project.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- project.xml 21 Aug 2004 18:42:04 -0000 1.45
+++ project.xml 3 Sep 2004 22:25:03 -0000 1.46
@@ -1,159 +1,151 @@
-<?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>
- <extend>../plugin-parent/project.xml</extend>
- <pomVersion>3</pomVersion>
- <id>maven-javadoc-plugin</id>
- <name>Maven Javadoc Plug-in</name>
- <currentVersion>1.7-SNAPSHOT</currentVersion>
- <description/>
- <shortDescription>Produce Javadocs and report</shortDescription>
- <url>http://maven.apache.org/reference/plugins/javadoc/</url>
- <issueTrackingUrl>http://jira.codehaus.org/browse/MPJAVADOC</issueTrackingUrl>
- <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven-plugins/javadoc/</connection>
- <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]:/home/cvs:maven-plugins/javadoc/</developerConnection>
- <url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
- </repository>
- <versions>
- <version>
- <id>1.3</id>
- <name>1.3</name>
- <tag>MAVEN_JAVADOC_1_3</tag>
- </version>
- <version>
- <id>1.4</id>
- <name>1.4</name>
- <tag>MAVEN_JAVADOC_1_4</tag>
- </version>
- <version>
- <id>1.5</id>
- <name>1.5</name>
- <tag>MAVEN_JAVADOC_1_5</tag>
- </version>
- <version>
- <id>1.6</id>
- <name>1.6</name>
- <tag>MAVEN_JAVADOC_1_6</tag>
- </version>
- <version>
- <id>1.6.1</id>
- <name>1.6.1</name>
- <tag>MAVEN_JAVADOC_1_6_1</tag>
- </version>
- </versions>
- <developers>
- <developer>
- <name>Emmanuel Venisse</name>
- <id>evenisse</id>
- <email>[EMAIL PROTECTED]</email>
- <organization/>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Stephane Mor</name>
- <id>smor</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Hasgard Systemes et Reseaux</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Zenplex</organization>
- <roles>
- <role>Architect</role>
- </roles>
- </developer>
- <developer>
- <name>Michal Maczka</name>
- <id>michal</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Dimatics</organization>
- <roles>
- <role>Jelly Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Vincent Massol</name>
- <id>vmassol</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Pivolis</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Arnaud Heritier</name>
- <id>aheritier</id>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Developer</role>
- <role>Release Manager</role>
- </roles>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <resources>
- <resource>
- <directory>src/test</directory>
- <includes>
- <include>**/*.txt</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- <resources>
- <resource>
- <directory>${basedir}/src/plugin-resources</directory>
- <targetPath>plugin-resources</targetPath>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>plugin.jelly</include>
- <include>plugin.properties</include>
- <include>project.properties</include>
- <include>project.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-</project>
+ <extend>../plugin-parent/project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <name>Maven Javadoc Plug-in</name>
+ <groupId>maven-javadoc-plugin</groupId>
+ <currentVersion>1.7-SNAPSHOT</currentVersion>
+ <shortDescription>Produce Javadocs and report</shortDescription>
+ <url>http://maven.apache.org/reference/plugins/javadoc/</url>
+ <issueTrackingUrl>http://jira.codehaus.org/browse/MPJAVADOC</issueTrackingUrl>
+ <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
+ <repository>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven-plugins/javadoc/</connection>
+ <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]:/home/cvs:maven-plugins/javadoc/</developerConnection>
+ <url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
+ </repository>
+ <versions>
+ <version>
+ <id>1.3</id>
+ <name>1.3</name>
+ <tag>MAVEN_JAVADOC_1_3</tag>
+ </version>
+ <version>
+ <id>1.4</id>
+ <name>1.4</name>
+ <tag>MAVEN_JAVADOC_1_4</tag>
+ </version>
+ <version>
+ <id>1.5</id>
+ <name>1.5</name>
+ <tag>MAVEN_JAVADOC_1_5</tag>
+ </version>
+ <version>
+ <id>1.6</id>
+ <name>1.6</name>
+ <tag>MAVEN_JAVADOC_1_6</tag>
+ </version>
+ <version>
+ <id>1.6.1</id>
+ <name>1.6.1</name>
+ <tag>MAVEN_JAVADOC_1_6_1</tag>
+ </version>
+ </versions>
+ <developers>
+ <developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Stephane Mor</name>
+ <id>smor</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Hasgard Systemes et Reseaux</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jason van Zyl</name>
+ <id>jvanzyl</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Zenplex</organization>
+ <roles>
+ <role>Architect</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Michal Maczka</name>
+ <id>michal</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Dimatics</organization>
+ <roles>
+ <role>Jelly Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Vincent Massol</name>
+ <id>vmassol</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Pivolis</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Arnaud Heritier</name>
+ <id>aheritier</id>
+ <email>[EMAIL PROTECTED]</email>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <properties/>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ <properties/>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.txt</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </unitTest>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/plugin-resources</directory>
+ <targetPath>plugin-resources</targetPath>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>plugin.jelly</include>
+ <include>plugin.properties</include>
+ <include>project.properties</include>
+ <include>project.xml</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </build>
+ <properties/>
+</project>
\ No newline at end of file
1.3 +7 -7
maven-plugins/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java
Index: JavadocWarningsTextToXml.java
===================================================================
RCS file:
/home/cvs/maven-plugins/javadoc/src/main/org/apache/maven/javadoc/JavadocWarningsTextToXml.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavadocWarningsTextToXml.java 2 Sep 2004 03:37:21 -0000 1.2
+++ JavadocWarningsTextToXml.java 3 Sep 2004 22:25:03 -0000 1.3
@@ -17,9 +17,6 @@
* ====================================================================
*/
-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,15 +26,17 @@
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.
@@ -279,7 +278,8 @@
Set lineMessages = (Set) fileMessages.get(new Integer(lineNumber));
if (lineMessages == null) {
- lineMessages = new LinkedHashSet();
+ lineMessages = new ListOrderedSet();
+
fileMessages.put(
new Integer(lineNumber),
lineMessages
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
