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/07/23 14:30:43 UTC
svn commit: r797039 [2/2] - in /maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugin/javadoc/
test/java/org/apache/maven/plugin/javadoc/
test/java/org/apache/maven/plugin/javadoc/stubs/
test/resources/unit/fix-jdk5-test/ test...
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java?rev=797039&r1=797038&r2=797039&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java Thu Jul 23 12:30:42 2009
@@ -24,7 +24,6 @@
*
* @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
* @version $Id: $
- * @since 1.0
*/
public interface InterfaceWithNoJavadoc
{
@@ -45,4 +44,17 @@
* @param aString a {@link java.lang.String} object.
*/
void missingJavadoc2( String aString );
+
+ // ----------------------------------------------------------------------
+ // New methods to be found by Clirr.
+ // ----------------------------------------------------------------------
+
+ /**
+ * <p>newInterfaceMethod</p>
+ *
+ * @param aString a {@link java.lang.String} object.
+ * @return a {@link java.lang.String} object.
+ * @since 1.1
+ */
+ public String newInterfaceMethod( String aString );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml?rev=797039&r1=797038&r2=797039&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/pom.xml Thu Jul 23 12:30:42 2009
@@ -22,7 +22,7 @@
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.unit</groupId>
<artifactId>fix-test</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>Javadoc Test Project</name>
<packaging>jar</packaging>
@@ -42,15 +42,17 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugin.javadoc.stubs.FixMavenProjectStub"/>
+ <localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/fix-test/target/generated</outputDirectory>
- <defaultSince>1.0-SNAPSHOT</defaultSince>
+ <defaultSince>1.1-SNAPSHOT</defaultSince>
<encoding>UTF-8</encoding>
<fixTags>all</fixTags>
<fixClassComment>true</fixClassComment>
<fixFieldComment>true</fixFieldComment>
<fixMethodComment>true</fixMethodComment>
<force>true</force>
- <ignoreClirr>true</ignoreClirr>
+ <ignoreClirr>false</ignoreClirr>
+ <comparisonVersion>1.0</comparisonVersion>
<includes>**/*.java</includes>
<level>protected</level>
<defaultAuthor><![CDATA[<a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>]]></defaultAuthor>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.jar?rev=797039&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom?rev=797039&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom Thu Jul 23 12:30:42 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.unit</groupId>
+ <artifactId>fix-test</artifactId>
+ <version>1.0</version>
+ <name>Javadoc Test Project</name>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugin.javadoc.stubs.FixMavenProjectStub"/>
+ <outputDirectory>${basedir}/target/test/unit/fix-test/target/generated</outputDirectory>
+ <defaultSince>1.0-SNAPSHOT</defaultSince>
+ <encoding>UTF-8</encoding>
+ <fixTags>all</fixTags>
+ <fixClassComment>true</fixClassComment>
+ <fixFieldComment>true</fixFieldComment>
+ <fixMethodComment>true</fixMethodComment>
+ <force>true</force>
+ <ignoreClirr>true</ignoreClirr>
+ <includes>**/*.java</includes>
+ <level>protected</level>
+ <defaultAuthor><![CDATA[<a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>]]></defaultAuthor>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/1.0/fix-test-1.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/maven-metadata-local.xml?rev=797039&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/maven-metadata-local.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/maven-metadata-local.xml Thu Jul 23 12:30:42 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.unit</groupId>
+ <artifactId>fix-test</artifactId>
+ <version>1.0</version>
+ <versioning>
+ <versions>
+ <version>1.0</version>
+ </versions>
+ <lastUpdated>20090723104349</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/maven-metadata-local.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-test/maven-metadata-local.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java?rev=797039&r1=797038&r2=797039&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java Thu Jul 23 12:30:42 2009
@@ -186,6 +186,18 @@
}
// ----------------------------------------------------------------------
+ // New methods to be found by Clirr.
+ // ----------------------------------------------------------------------
+
+ /**
+ * New class method to be found by Clirr.
+ */
+ public String newClassMethod( String aString )
+ {
+ return null;
+ }
+
+ // ----------------------------------------------------------------------
// Inheritance
// ----------------------------------------------------------------------
@@ -234,6 +246,14 @@
return null;
}
+ /**
+ * New interface method to be found by Clirr.
+ */
+ public String newInterfaceMethod( String aString )
+ {
+ return null;
+ }
+
// ----------------------------------------------------------------------
// Inner classes
// ----------------------------------------------------------------------
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithNoJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithNoJavadoc.java?rev=797039&r1=797038&r2=797039&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithNoJavadoc.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithNoJavadoc.java Thu Jul 23 12:30:42 2009
@@ -65,6 +65,15 @@
}
// ----------------------------------------------------------------------
+ // New methods to be found by Clirr.
+ // ----------------------------------------------------------------------
+
+ public String newClassMethod( String aString )
+ {
+ return null;
+ }
+
+ // ----------------------------------------------------------------------
// Inheritance
// ----------------------------------------------------------------------
@@ -77,6 +86,11 @@
{
}
+ public String newInterfaceMethod( String aString )
+ {
+ return null;
+ }
+
// ----------------------------------------------------------------------
// Inner classes
// ----------------------------------------------------------------------
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithJavadoc.java?rev=797039&r1=797038&r2=797039&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithJavadoc.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithJavadoc.java Thu Jul 23 12:30:42 2009
@@ -56,4 +56,13 @@
* Nothing.
*/
public String method5( String aString );
+
+ // ----------------------------------------------------------------------
+ // New methods to be found by Clirr.
+ // ----------------------------------------------------------------------
+
+ /**
+ * New interface method to be found by Clirr.
+ */
+ public String newInterfaceMethod( String aString );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java?rev=797039&r1=797038&r2=797039&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java Thu Jul 23 12:30:42 2009
@@ -27,4 +27,10 @@
// take care of identifier
void missingJavadoc2( String aString );
+
+ // ----------------------------------------------------------------------
+ // New methods to be found by Clirr.
+ // ----------------------------------------------------------------------
+
+ public String newInterfaceMethod( String aString );
}