You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2009/09/06 14:37:17 UTC
svn commit: r811825 - in /maven/plugins/trunk/maven-javadoc-plugin: ./
src/it/MJAVADOC-257/ src/it/MJAVADOC-257/myj2ee/
src/it/MJAVADOC-257/myj2ee/ear/ src/it/MJAVADOC-257/myj2ee/ejbs/
src/it/MJAVADOC-257/myj2ee/ejbs/src/ src/it/MJAVADOC-257/myj2ee/ejb...
Author: vsiveton
Date: Sun Sep 6 12:37:15 2009
New Revision: 811825
URL: http://svn.apache.org/viewvc?rev=811825&view=rev
Log:
MJAVADOC-257: maven-javadoc-plugin 2.5, 2.6 and mojo: Error extracting plugin descriptor
o using immutable lists for project compile source roots and artifacts
o added IT
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/goals.txt (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/resources/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/resources/META-INF/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/resources/META-INF/ejb-jar.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/WEB-INF/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/WEB-INF/web.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/index.jsp (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/src/main/resources/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/MyMojo.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/verify.bsh
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=811825&r1=811824&r2=811825&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Sep 6 12:37:15 2009
@@ -355,6 +355,7 @@
<pomInclude>**/MJAVADOC-226/pom.xml</pomInclude>
<pomInclude>**/MJAVADOC-97/pom.xml</pomInclude>
<pomInclude>**/MJAVADOC-181/pom.xml</pomInclude>
+ <pomInclude>**/MJAVADOC-257/pom.xml</pomInclude>
</pomIncludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/goals.txt?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/goals.txt (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/goals.txt Sun Sep 6 12:37:15 2009
@@ -0,0 +1 @@
+clean site
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/goals.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>ear</artifactId>
+ <packaging>ear</packaging>
+ <version>1.0</version>
+
+ <name>ear assembly</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ear/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <packaging>ejb</packaging>
+ <version>1.0</version>
+
+ <name>enterprise java beans</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/resources/META-INF/ejb-jar.xml?rev=811825&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/ejbs/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>myparent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>root</groupId>
+ <version>1.0</version>
+ <artifactId>project</artifactId>
+ <packaging>pom</packaging>
+
+ <name>project</name>
+
+ <modules>
+ <module>projects</module>
+ <module>primary-source</module>
+ <module>servlets</module>
+ <module>ejbs</module>
+ <module>ear</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <version>1.0</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <packaging>jar</packaging>
+ <name>core project classes</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>iso-8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/primary-source/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>projects</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ <packaging>jar</packaging>
+ <name>logging</name>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/logging/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <version>1.0</version>
+ <artifactId>projects</artifactId>
+ <packaging>pom</packaging>
+
+ <name>sub projects</name>
+
+ <modules>
+ <module>logging</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/projects/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <packaging>pom</packaging>
+ <name>servlets</name>
+ <version>1.0</version>
+
+ <modules>
+ <module>servlet</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <packaging>war</packaging>
+ <name>servlet</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/WEB-INF/web.xml?rev=811825&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/index.jsp?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/index.jsp (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/index.jsp Sun Sep 6 12:37:15 2009
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/myj2ee/servlets/servlet/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>myparent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>com.mycompany.mymojo</groupId>
+ <artifactId>mymojo</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>mymojo Maven Mojo</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/MyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/MyMojo.java?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/MyMojo.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/MyMojo.java Sun Sep 6 12:37:15 2009
@@ -0,0 +1,84 @@
+package com.mycompany.mymojo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * Goal which touches a timestamp file.
+ *
+ * @goal touch
+ *
+ * @phase process-sources
+ */
+public class MyMojo
+ extends AbstractMojo
+{
+ /**
+ * Location of the file.
+ * @parameter expression="${project.build.directory}"
+ * @required
+ */
+ private File outputDirectory;
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ File f = outputDirectory;
+
+ if ( !f.exists() )
+ {
+ f.mkdirs();
+ }
+
+ File touch = new File( f, "touch.txt" );
+
+ FileWriter w = null;
+ try
+ {
+ w = new FileWriter( touch );
+
+ w.write( "touch.txt" );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Error creating file " + touch, e );
+ }
+ finally
+ {
+ if ( w != null )
+ {
+ try
+ {
+ w.close();
+ }
+ catch ( IOException e )
+ {
+ // ignore
+ }
+ }
+ }
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/MyMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/mymojo/src/main/java/com/mycompany/mymojo/MyMojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml Sun Sep 6 12:37:15 2009
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>myparent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test MJAVADOC-257</name>
+
+ <modules>
+ <module>myj2ee</module>
+ <module>mymojo</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ </links>
+ </configuration>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/verify.bsh?rev=811825&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/verify.bsh Sun Sep 6 12:37:15 2009
@@ -0,0 +1,41 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import java.io.*;
+
+boolean result = true;
+
+try
+{
+ // Generated files checks
+ File apidocs = new File( basedir, "target/site/apidocs" );
+ if ( !apidocs.exists() || !apidocs.isDirectory() )
+ {
+ System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." );
+ return false;
+ }
+}
+catch( RuntimeException e )
+{
+ e.printStackTrace();
+ return false;
+}
+
+return result;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=811825&r1=811824&r2=811825&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Sun Sep 6 12:37:15 2009
@@ -416,7 +416,8 @@
*/
protected List getProjectSourceRoots( MavenProject p )
{
- return p.getCompileSourceRoots();
+ return ( p.getCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getCompileSourceRoots() ) );
}
/**
@@ -427,7 +428,8 @@
protected List getCompileClasspathElements( MavenProject p )
throws DependencyResolutionRequiredException
{
- return p.getCompileClasspathElements();
+ return ( p.getCompileClasspathElements() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getCompileClasspathElements() ) );
}
/**
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=811825&r1=811824&r2=811825&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun Sep 6 12:37:15 2009
@@ -35,6 +35,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -1568,7 +1569,8 @@
return Collections.EMPTY_LIST;
}
- return p.getCompileSourceRoots();
+ return ( p.getCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getCompileSourceRoots() ) );
}
/**
@@ -1582,7 +1584,8 @@
return Collections.EMPTY_LIST;
}
- return p.getExecutionProject().getCompileSourceRoots();
+ return ( p.getExecutionProject().getCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getExecutionProject().getCompileSourceRoots() ) );
}
/**
@@ -1591,7 +1594,8 @@
*/
protected List getProjectArtifacts( MavenProject p )
{
- return p.getCompileArtifacts();
+ return ( p.getCompileArtifacts() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getCompileArtifacts() ) );
}
/**
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java?rev=811825&r1=811824&r2=811825&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java Sun Sep 6 12:37:15 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
@@ -43,14 +45,16 @@
/** {@inheritDoc} */
protected List getProjectSourceRoots( MavenProject p )
{
- return p.getTestCompileSourceRoots();
+ return ( p.getTestCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getTestCompileSourceRoots() ) );
}
/** {@inheritDoc} */
protected List getCompileClasspathElements( MavenProject p )
throws DependencyResolutionRequiredException
{
- return p.getTestClasspathElements();
+ return ( p.getTestClasspathElements() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getTestClasspathElements() ) );
}
/** {@inheritDoc} */
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java?rev=811825&r1=811824&r2=811825&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java Sun Sep 6 12:37:15 2009
@@ -22,6 +22,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -246,7 +247,8 @@
return Collections.EMPTY_LIST;
}
- return p.getTestCompileSourceRoots();
+ return ( p.getTestCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getTestCompileSourceRoots() ) );
}
/** {@inheritDoc} */
@@ -257,13 +259,14 @@
return Collections.EMPTY_LIST;
}
- return p.getExecutionProject().getTestCompileSourceRoots();
+ return ( p.getExecutionProject().getTestCompileSourceRoots() == null ? Collections.EMPTY_LIST
+ : new LinkedList( p.getExecutionProject().getTestCompileSourceRoots() ) );
}
/** {@inheritDoc} */
protected List getProjectArtifacts( MavenProject p )
{
- return p.getTestArtifacts();
+ return ( p.getTestArtifacts() == null ? Collections.EMPTY_LIST : new LinkedList( p.getTestArtifacts() ) );
}
/** {@inheritDoc} */