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/09 14:09:13 UTC
svn commit: r792518 - 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/resou...
Author: vsiveton
Date: Thu Jul 9 12:09:12 2009
New Revision: 792518
URL: http://svn.apache.org/viewvc?rev=792518&view=rev
Log:
o added jdk5 and jdk6 tests cases for fix plugin
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk5MavenProjectStub.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk6MavenProjectStub.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/SubClassWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithNoJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/SubClassWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/ClassWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/ClassWithJavadoc.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/InterfaceWithJavadoc.java (with props)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java (props changed)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithNoJavadoc.java (props changed)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithJavadoc.java (props changed)
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java (props changed)
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=792518&r1=792517&r2=792518&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 Thu Jul 9 12:09:12 2009
@@ -205,8 +205,8 @@
private MavenProjectBuilder mavenProjectBuilder;
/** @component */
- private ToolchainManager toolchainManager;
-
+ private ToolchainManager toolchainManager;
+
// ----------------------------------------------------------------------
// Mojo parameters
// ----------------------------------------------------------------------
@@ -332,7 +332,7 @@
/**
* Whether to build an aggregated report at the root, or build individual reports.
- *
+ *
* @parameter expression="${aggregate}" default-value="false"
* @deprecated As of version 2.5, use the goals <code>javadoc:aggregate</code> and
* <code>javadoc:test-aggregate</code> instead.
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java?rev=792518&r1=792517&r2=792518&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java Thu Jul 9 12:09:12 2009
@@ -28,6 +28,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.lang.SystemUtils;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.shared.invoker.DefaultInvocationRequest;
import org.apache.maven.shared.invoker.DefaultInvoker;
@@ -53,39 +54,77 @@
/** The M2_HOME env variable */
private static final File M2_HOME;
+ /** The M2_HOME env variable */
+ private static final File JAVA_HOME;
+
static
{
- String mavenHome = System.getProperty( "maven.home" );
+ M2_HOME = getM2Home();
- if ( mavenHome == null )
+ JAVA_HOME = getJavaHome();
+ }
+
+ /**
+ * @throws Exception if any
+ */
+ public void testFix()
+ throws Exception
+ {
+ File testPomBasedir = new File( getBasedir(), "target/test/unit/fix-test" );
+
+ executeMojoAndTest( testPomBasedir, new String[] { "ClassWithJavadoc.java", "ClassWithNoJavadoc.java",
+ "InterfaceWithJavadoc.java", "InterfaceWithNoJavadoc.java" } );
+ }
+
+ /**
+ * @throws Exception if any
+ */
+ public void testFixJdk5()
+ throws Exception
+ {
+ if ( !SystemUtils.isJavaVersionAtLeast( 1.5f ) )
{
- try
- {
- mavenHome = CommandLineUtils.getSystemEnvVars().getProperty( "M2_HOME" );
- }
- catch ( IOException e )
- {
- // nop
- }
+ getContainer().getLogger().warn(
+ "JDK 5.0 or more is required to run fix for '" + getClass().getName()
+ + "#" + getName() + "()'." );
+ return;
}
- if ( mavenHome == null )
+ File testPomBasedir = new File( getBasedir(), "target/test/unit/fix-jdk5-test" );
+ executeMojoAndTest( testPomBasedir, new String[] { "ClassWithJavadoc.java", "ClassWithNoJavadoc.java",
+ "InterfaceWithJavadoc.java", "InterfaceWithNoJavadoc.java", "SubClassWithJavadoc.java" } );
+ }
+
+ /**
+ * @throws Exception if any
+ */
+ public void testFixJdk6()
+ throws Exception
+ {
+ if ( !SystemUtils.isJavaVersionAtLeast( 1.6f ) )
{
- fail( "Cannot find Maven application "
- + "directory. Either specify \'maven.home\' system property, or M2_HOME environment variable." );
+ getContainer().getLogger().warn(
+ "JDK 6.0 or more is required to run fix for '" + getClass().getName()
+ + "#" + getName() + "()'." );
+ return;
}
- M2_HOME = new File( mavenHome );
+ File testPomBasedir = new File( getBasedir(), "target/test/unit/fix-jdk6-test" );
+ executeMojoAndTest( testPomBasedir, new String[] { "ClassWithJavadoc.java", "InterfaceWithJavadoc.java" } );
}
+ // ----------------------------------------------------------------------
+ // private methods
+ // ----------------------------------------------------------------------
+
/**
+ * @param testPomBasedir the basedir for the test project
+ * @param clazzToCompare an array of the classes name to compare
* @throws Exception if any
*/
- public void testFix()
+ private void executeMojoAndTest( File testPomBasedir, String[] clazzToCompare )
throws Exception
{
- File testPomBasedir = new File( getBasedir(), "target/test/unit/fix-test" );
-
prepareTestProjects( testPomBasedir.getName() );
File testPom = new File( testPomBasedir, "pom.xml" );
@@ -99,41 +138,17 @@
assertNotNull( mojo );
mojo.execute();
- File expectedDir = new File( testPomBasedir, "expected/src/main/java/fix/test" );
+ File expectedDir = new File( testPomBasedir, "expected/src/main/java/fix/test" );
assertTrue( expectedDir.exists() );
File generatedDir = new File( testPomBasedir, "target/generated/fix/test" );
assertTrue( generatedDir.exists() );
- String className = "ClassWithJavadoc.java";
- assertEquals( new File( expectedDir, className ), new File( generatedDir, className ) );
-
- className = "ClassWithNoJavadoc.java";
- assertEquals( new File( expectedDir, className ), new File( generatedDir, className ) );
-
- className = "InterfaceWithJavadoc.java";
- assertEquals( new File( expectedDir, className ), new File( generatedDir, className ) );
-
- className = "InterfaceWithNoJavadoc.java";
- assertEquals( new File( expectedDir, className ), new File( generatedDir, className ) );
- }
-
- /**
- * Asserts that files are equal. If they are not an AssertionFailedError is thrown.
- *
- * @throws IOException if any
- */
- private static void assertEquals( File expected, File actual )
- throws IOException
- {
- assertTrue( expected.exists() );
- String expectedContent = StringUtils.unifyLineSeparators( readFile( expected ) );
-
- assertTrue( actual.exists() );
- String actualContent = StringUtils.unifyLineSeparators( readFile( actual ) );
-
- assertEquals( "Expected file: " + expected.getAbsolutePath() + ", actual file: "
- + actual.getAbsolutePath(), expectedContent, actualContent );
+ for ( int i = 0; i < clazzToCompare.length; i++ )
+ {
+ String className = clazzToCompare[i];
+ assertEquals( new File( expectedDir, className ), new File( generatedDir, className ) );
+ }
}
/**
@@ -146,14 +161,19 @@
Invoker invoker = new DefaultInvoker();
invoker.setMavenHome( M2_HOME );
+ ByteArrayOutputStream invokerLog = new ByteArrayOutputStream();
+ InvocationOutputHandler outputHandler = new PrintStreamHandler( new PrintStream( invokerLog ), false );
+
+ outputHandler.consumeLine( "Invoke Maven" );
+ outputHandler.consumeLine( "M2_HOME=" + M2_HOME );
+ outputHandler.consumeLine( "JAVA_HOME=" + JAVA_HOME );
+
InvocationRequest request = new DefaultInvocationRequest();
request.setBaseDirectory( testPom.getParentFile() );
request.setPomFile( testPom );
-
- ByteArrayOutputStream invokerLog = new ByteArrayOutputStream();
- InvocationOutputHandler outputHandler = new PrintStreamHandler( new PrintStream( invokerLog ), false );
request.setOutputHandler( outputHandler );
request.setDebug( true );
+ request.setJavaHome( JAVA_HOME );
request.setMavenOpts( "-Xms256m -Xmx256m" );
List goals = new ArrayList();
@@ -188,17 +208,117 @@
}
}
+ // ----------------------------------------------------------------------
+ // static methods
+ // ----------------------------------------------------------------------
+
+ /**
+ * Try to find the M2_HOME from System.getProperty( "maven.home" ) or M2_HOME env variable.
+ *
+ * @return the M2Home file
+ */
+ private static File getM2Home()
+ {
+ String mavenHome = System.getProperty( "maven.home" );
+
+ if ( mavenHome == null )
+ {
+ try
+ {
+ mavenHome = CommandLineUtils.getSystemEnvVars().getProperty( "M2_HOME" );
+ }
+ catch ( IOException e )
+ {
+ // nop
+ }
+ }
+
+ if ( mavenHome == null )
+ {
+ fail( "Cannot find Maven application directory. Either specify \'maven.home\' system property, or "
+ + "M2_HOME environment variable." );
+ }
+
+ File m2Home = new File( mavenHome );
+ if ( !m2Home.exists() )
+ {
+ fail( "Cannot find Maven application directory. Either specify \'maven.home\' system property, or "
+ + "M2_HOME environment variable." );
+ }
+
+ return m2Home;
+ }
+
+ /**
+ * Try to find the JAVA_HOME from System.getProperty( "java.home" )
+ * By default, System.getProperty( "java.home" ) = JRE_HOME and JRE_HOME should be in the JDK_HOME
+ *
+ * @return the JavaHome file
+ */
+ private static File getJavaHome()
+ {
+ File javaHome;
+ if ( SystemUtils.IS_OS_MAC_OSX )
+ {
+ javaHome = SystemUtils.getJavaHome();
+ }
+ else
+ {
+ javaHome = new File( SystemUtils.getJavaHome(), ".." );
+ }
+
+ if ( javaHome == null || !javaHome.exists() )
+ {
+ try
+ {
+ javaHome = new File( CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_HOME" ) );
+ }
+ catch ( IOException e )
+ {
+ // nop
+ }
+ }
+
+ if ( javaHome == null || !javaHome.exists() )
+ {
+ fail( "Cannot find Java application directory. Either specify \'java.home\' system property, or "
+ + "JAVA_HOME environment variable." );
+ }
+
+ return javaHome;
+ }
+
+ /**
+ * Asserts that files are equal. If they are not an AssertionFailedError is thrown.
+ *
+ * @throws IOException if any
+ */
+ private static void assertEquals( File expected, File actual )
+ throws IOException
+ {
+ assertTrue( expected.exists() );
+ String expectedContent = StringUtils.unifyLineSeparators( readFile( expected ) );
+
+ assertTrue( actual.exists() );
+ String actualContent = StringUtils.unifyLineSeparators( readFile( actual ) );
+
+ assertEquals( "Expected file: " + expected.getAbsolutePath() + ", actual file: "
+ + actual.getAbsolutePath(), expectedContent, actualContent );
+ }
+
/**
- * @param testDir not null
+ * @param testProjectDirName not null
* @throws IOException if any
*/
- private static void prepareTestProjects( String testDir )
+ private static void prepareTestProjects( String testProjectDirName )
throws IOException
{
- File testPomBasedir = new File( getBasedir(), "target/test/unit/" + testDir );
+ File testPomBasedir = new File( getBasedir(), "target/test/unit/" + testProjectDirName );
// Using unit test dir
- FileUtils.copyDirectoryStructure( new File( getBasedir(), "src/test/resources/unit/" + testDir ),
+ FileUtils
+ .copyDirectoryStructure(
+ new File( getBasedir(), "src/test/resources/unit/" + testProjectDirName ),
testPomBasedir );
List scmFiles = FileUtils.getDirectoryNames( testPomBasedir, "**/.svn", null, true );
for ( Iterator it = scmFiles.iterator(); it.hasNext(); )
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=792518&r1=792517&r2=792518&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java Thu Jul 9 12:09:12 2009
@@ -24,7 +24,6 @@
import java.io.FileReader;
import java.io.IOException;
-import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
@@ -612,8 +611,7 @@
{
getContainer().getLogger().warn(
"JDK 5.0 or more is required to run javadoc for '"
- + ClassUtils.getPackageName( getClass() ) + "#" + getName()
- + "()'." );
+ + getClass().getName() + "#" + getName() + "()'." );
return;
}
@@ -847,8 +845,7 @@
{
getContainer().getLogger().warn(
"JDK 6.0 or more is required to run javadoc for '"
- + ClassUtils.getPackageName( getClass() ) + "#" + getName()
- + "()'." );
+ + getClass().getName() + "#" + getName() + "()'." );
return;
}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk5MavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk5MavenProjectStub.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk5MavenProjectStub.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk5MavenProjectStub.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,94 @@
+package org.apache.maven.plugin.javadoc.stubs;
+
+/*
+ * 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.File;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+
+/**
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ * @version $Id$
+ */
+public class FixJdk5MavenProjectStub
+ extends MavenProjectStub
+{
+ public FixJdk5MavenProjectStub()
+ {
+ readModel( new File( getBasedir(), "pom.xml" ) );
+
+ addCompileSourceRoot( getBasedir().getAbsolutePath() + "/target/classes" );
+ addCompileSourceRoot( getBasedir().getAbsolutePath() + "/src/main/java" );
+
+ Build build = new Build();
+ build.setDirectory( getBasedir().getAbsolutePath() + "/target" );
+ build.setSourceDirectory( getBasedir().getAbsolutePath() + "/src/main/java" );
+ build.setOutputDirectory( getBasedir().getAbsolutePath() + "/target/classes" );
+ build.setTestSourceDirectory( getBasedir().getAbsolutePath() + "/src/test/java" );
+ build.setTestOutputDirectory( getBasedir().getAbsolutePath() + "/target/test-classes" );
+ setBuild( build );
+ }
+
+ /** {@inheritDoc} */
+ public String getArtifactId()
+ {
+ return getModel().getArtifactId();
+ }
+
+ /** {@inheritDoc} */
+ public String getGroupId()
+ {
+ String groupId = getModel().getGroupId();
+
+ if ( ( groupId == null ) && ( getModel().getParent() != null ) )
+ {
+ groupId = getModel().getParent().getGroupId();
+ }
+
+ return groupId;
+ }
+
+ /** {@inheritDoc} */
+ public String getVersion()
+ {
+ String version = getModel().getVersion();
+
+ if ( ( version == null ) && ( getModel().getParent() != null ) )
+ {
+ version = getModel().getParent().getVersion();
+ }
+
+ return version;
+ }
+
+ /** {@inheritDoc} */
+ public String getPackaging()
+ {
+ return getModel().getPackaging();
+ }
+
+ /** {@inheritDoc} */
+ public File getBasedir()
+ {
+ // Using unit test dir
+ return new File( super.getBasedir() + "/target/test/unit/fix-jdk5-test/" );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk5MavenProjectStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk5MavenProjectStub.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk6MavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk6MavenProjectStub.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk6MavenProjectStub.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk6MavenProjectStub.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,94 @@
+package org.apache.maven.plugin.javadoc.stubs;
+
+/*
+ * 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.File;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+
+/**
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ * @version $Id$
+ */
+public class FixJdk6MavenProjectStub
+ extends MavenProjectStub
+{
+ public FixJdk6MavenProjectStub()
+ {
+ readModel( new File( getBasedir(), "pom.xml" ) );
+
+ addCompileSourceRoot( getBasedir().getAbsolutePath() + "/target/classes" );
+ addCompileSourceRoot( getBasedir().getAbsolutePath() + "/src/main/java" );
+
+ Build build = new Build();
+ build.setDirectory( getBasedir().getAbsolutePath() + "/target" );
+ build.setSourceDirectory( getBasedir().getAbsolutePath() + "/src/main/java" );
+ build.setOutputDirectory( getBasedir().getAbsolutePath() + "/target/classes" );
+ build.setTestSourceDirectory( getBasedir().getAbsolutePath() + "/src/test/java" );
+ build.setTestOutputDirectory( getBasedir().getAbsolutePath() + "/target/test-classes" );
+ setBuild( build );
+ }
+
+ /** {@inheritDoc} */
+ public String getArtifactId()
+ {
+ return getModel().getArtifactId();
+ }
+
+ /** {@inheritDoc} */
+ public String getGroupId()
+ {
+ String groupId = getModel().getGroupId();
+
+ if ( ( groupId == null ) && ( getModel().getParent() != null ) )
+ {
+ groupId = getModel().getParent().getGroupId();
+ }
+
+ return groupId;
+ }
+
+ /** {@inheritDoc} */
+ public String getVersion()
+ {
+ String version = getModel().getVersion();
+
+ if ( ( version == null ) && ( getModel().getParent() != null ) )
+ {
+ version = getModel().getParent().getVersion();
+ }
+
+ return version;
+ }
+
+ /** {@inheritDoc} */
+ public String getPackaging()
+ {
+ return getModel().getPackaging();
+ }
+
+ /** {@inheritDoc} */
+ public File getBasedir()
+ {
+ // Using unit test dir
+ return new File( super.getBasedir() + "/target/test/unit/fix-jdk6-test/" );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk6MavenProjectStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/FixJdk6MavenProjectStub.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,72 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+import java.util.Map;
+
+/**
+ * To add default class tags.
+ *
+ * @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
+ * @version $Id: $
+ * @since 1.0
+ */
+public class ClassWithJavadoc
+ implements InterfaceWithJavadoc
+{
+ /**
+ * Empty constructor.
+ */
+ public ClassWithJavadoc()
+ {
+ }
+
+ /**
+ * Constructor with generic param.
+ *
+ * @param list a {@link java.util.List} object.
+ */
+ public ClassWithJavadoc( List<String> list )
+ {
+ }
+
+ /**
+ * QDOX-155
+ *
+ * @param request a T object.
+ * @return a {@link java.util.List} object.
+ * @throws java.lang.Exception if any.
+ */
+ public <T extends String> List<String> withGenericParameter( T request )
+ throws Exception
+ {
+ return null;
+ }
+
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ /** {@inheritDoc} */
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,73 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+import java.util.Map;
+
+/**
+ * <p>ClassWithNoJavadoc class.</p>
+ *
+ * @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
+ * @version $Id: $
+ * @since 1.0
+ */
+public class ClassWithNoJavadoc
+ implements InterfaceWithNoJavadoc
+{
+ /**
+ * <p>Constructor for ClassWithNoJavadoc.</p>
+ */
+ public ClassWithNoJavadoc()
+ {
+ }
+
+ /**
+ * <p>Constructor for ClassWithNoJavadoc.</p>
+ *
+ * @param list a {@link java.util.List} object.
+ */
+ public ClassWithNoJavadoc( List<String> list )
+ {
+ }
+
+ // QDOX-155
+ /**
+ * <p>withGenericParameter</p>
+ *
+ * @param request a T object.
+ * @return a {@link java.util.List} object.
+ * @throws java.lang.Exception if any.
+ */
+ public <T extends String> List<String> withGenericParameter( T request )
+ throws Exception
+ {
+ return null;
+ }
+
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ /** {@inheritDoc} */
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,45 @@
+package fix.test;
+
+/*
+ * 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.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * To add default interface tags.
+ *
+ * @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
+ * @version $Id: $
+ * @since 1.0
+ */
+public interface InterfaceWithJavadoc
+{
+ /** default comment */
+ Map<String, String> MY_MAP_CONSTANT = Collections.singletonMap( "key", "value" );
+
+ /**
+ * To add default method tags.
+ *
+ * @param aList a {@link java.util.List} object.
+ * @param aMap a {@link java.util.Map} object.
+ */
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap );
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-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-jdk5-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,48 @@
+package fix.test;
+
+/*
+ * 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.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>InterfaceWithNoJavadoc interface.</p>
+ *
+ * @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
+ * @version $Id: $
+ * @since 1.0
+ */
+public interface InterfaceWithNoJavadoc
+{
+ /** Constant <code>MY_LIST_CONSTANT</code> */
+ List<String> MY_LIST_CONSTANT = Collections.singletonList( "value" );
+
+ /** Constant <code>MY_MAP_CONSTANT</code> */
+ Map<String, String> MY_MAP_CONSTANT = Collections.singletonMap( "key", "value" );
+
+ /**
+ * <p>withGenericParameters</p>
+ *
+ * @param aList a {@link java.util.List} object.
+ * @param aMap a {@link java.util.Map} object.
+ */
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap );
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/SubClassWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/SubClassWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/SubClassWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/SubClassWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,44 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+import java.util.Map;
+
+/**
+ * To add default class tags.
+ *
+ * @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
+ * @version $Id: $
+ * @since 1.0
+ */
+public class SubClassWithJavadoc
+ extends ClassWithJavadoc
+{
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ /** {@inheritDoc} */
+ @Override
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/SubClassWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/pom.xml?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/pom.xml Thu Jul 9 12:09:12 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-jdk5-test</artifactId>
+ <version>1.0-SNAPSHOT</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.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugin.javadoc.stubs.FixJdk5MavenProjectStub"/>
+ <outputDirectory>${basedir}/target/test/unit/fix-jdk5-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-jdk5-test/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-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-jdk5-test/src/main/java/fix/test/ClassWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,62 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+import java.util.Map;
+
+/**
+ * To add default class tags.
+ */
+public class ClassWithJavadoc
+ implements InterfaceWithJavadoc
+{
+ /**
+ * Empty constructor.
+ */
+ public ClassWithJavadoc()
+ {
+ }
+
+ /**
+ * Constructor with generic param.
+ */
+ public ClassWithJavadoc( List<String> list )
+ {
+ }
+
+ /**
+ * QDOX-155
+ */
+ public <T extends String> List<String> withGenericParameter( T request )
+ throws Exception
+ {
+ return null;
+ }
+
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ /** {@inheritDoc} */
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-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-jdk5-test/src/main/java/fix/test/ClassWithNoJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithNoJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithNoJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,51 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+import java.util.Map;
+
+public class ClassWithNoJavadoc
+ implements InterfaceWithNoJavadoc
+{
+ public ClassWithNoJavadoc()
+ {
+ }
+
+ public ClassWithNoJavadoc( List<String> list )
+ {
+ }
+
+ // QDOX-155
+ public <T extends String> List<String> withGenericParameter( T request )
+ throws Exception
+ {
+ return null;
+ }
+
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ /** {@inheritDoc} */
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithNoJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-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-jdk5-test/src/main/java/fix/test/InterfaceWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,38 @@
+package fix.test;
+
+/*
+ * 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.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * To add default interface tags.
+ */
+public interface InterfaceWithJavadoc
+{
+ /** default comment */
+ Map<String, String> MY_MAP_CONSTANT = Collections.singletonMap( "key", "value" );
+
+ /**
+ * To add default method tags.
+ */
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap );
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-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-jdk5-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,33 @@
+package fix.test;
+
+/*
+ * 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.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public interface InterfaceWithNoJavadoc
+{
+ List<String> MY_LIST_CONSTANT = Collections.singletonList( "value" );
+
+ Map<String, String> MY_MAP_CONSTANT = Collections.singletonMap( "key", "value" );
+
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap );
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/SubClassWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/SubClassWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/SubClassWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/SubClassWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,39 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+import java.util.Map;
+
+/**
+ * To add default class tags.
+ */
+public class SubClassWithJavadoc
+ extends ClassWithJavadoc
+{
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ @Override
+ public void withGenericParameters( List<String> aList, Map<Map<String, List<String>>, List<String>> aMap )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/SubClassWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/ClassWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/ClassWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/ClassWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/ClassWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,57 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+
+/**
+ * To add default class tags.
+ *
+ * @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
+ * @version $Id: $
+ * @since 1.0
+ */
+public class ClassWithJavadoc
+ implements InterfaceWithJavadoc
+{
+ /**
+ * Constructor with generic param.
+ *
+ * @param list a {@link java.util.List} object.
+ */
+ public ClassWithJavadoc( List<String> list )
+ {
+ }
+
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ /** {@inheritDoc} */
+ @Override
+ public void withGenericParameters( List<String> aList )
+ {
+ }
+
+ /** {@inheritDoc} */
+ public void withGenericParameters2( List<String> aList )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/ClassWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,46 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+
+/**
+ * To add default interface tags.
+ *
+ * @author <a href="mailto:vsiveton@apache.org">vsiveton@apache.org</a>
+ * @version $Id: $
+ * @since 1.0
+ */
+public interface InterfaceWithJavadoc
+{
+ /**
+ * To add default method tags.
+ *
+ * @param aList a {@link java.util.List} object.
+ */
+ public void withGenericParameters( List<String> aList );
+
+ /**
+ * To take care of identifier.
+ *
+ * @param aList a {@link java.util.List} object.
+ */
+ void withGenericParameters2( List<String> aList );
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/pom.xml?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/pom.xml Thu Jul 9 12:09:12 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-jdk6-test</artifactId>
+ <version>1.0-SNAPSHOT</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.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugin.javadoc.stubs.FixJdk6MavenProjectStub"/>
+ <outputDirectory>${basedir}/target/test/unit/fix-jdk6-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-jdk6-test/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-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-jdk6-test/src/main/java/fix/test/ClassWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/ClassWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/ClassWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,52 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+
+/**
+ * To add default class tags.
+ */
+public class ClassWithJavadoc
+ implements InterfaceWithJavadoc
+{
+ /**
+ * Constructor with generic param.
+ */
+ public ClassWithJavadoc( List<String> list )
+ {
+ }
+
+ // ----------------------------------------------------------------------
+ // Inheritance
+ // ----------------------------------------------------------------------
+
+ @Override
+ public void withGenericParameters( List<String> aList )
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void withGenericParameters2( List<String> aList )
+ {
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/ClassWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-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-jdk6-test/src/main/java/fix/test/InterfaceWithJavadoc.java?rev=792518&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/InterfaceWithJavadoc.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/InterfaceWithJavadoc.java Thu Jul 9 12:09:12 2009
@@ -0,0 +1,38 @@
+package fix.test;
+
+/*
+ * 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.util.List;
+
+/**
+ * To add default interface tags.
+ */
+public interface InterfaceWithJavadoc
+{
+ /**
+ * To add default method tags.
+ */
+ public void withGenericParameters( List<String> aList );
+
+ /**
+ * To take care of identifier.
+ */
+ void withGenericParameters2( List<String> aList );
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/InterfaceWithJavadoc.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java
('svn:keywords' removed)
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithNoJavadoc.java
('svn:keywords' removed)
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithJavadoc.java
('svn:keywords' removed)
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java
('svn:keywords' removed)