You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/08/15 23:37:48 UTC
svn commit: r985765 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc:
./ stubs/
Author: hboutemy
Date: Sun Aug 15 21:37:47 2010
New Revision: 985765
URL: http://svn.apache.org/viewvc?rev=985765&view=rev
Log:
o added Java 5 generics
o removed code already here by inheritence
Modified:
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/JavadocJarTest.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/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject1TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject2TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/CustomConfigurationMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DefaultConfigurationMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletPathTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HeaderFooterTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HelpFileMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk5TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/NewlineTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/PomMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/QuotedPathMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SettingsStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StylesheetFileMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SubpackagesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletArtifactsMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TestJavadocMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java
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=985765&r1=985764&r2=985765&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 Sun Aug 15 21:37:47 2010
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import junitx.util.PrivateAccessor;
@@ -108,12 +107,12 @@ public class FixJavadocMojoTest
FileUtils.copyDirectoryStructure( sourceDir, localRepo );
// Remove SCM files
- List files =
+ List<String> files =
FileUtils.getFileAndDirectoryNames( localRepo, FileUtils.getDefaultExcludesAsString(), null, true,
true, true, true );
- for ( Iterator it = files.iterator(); it.hasNext(); )
+ for ( String filename : files )
{
- File file = new File( it.next().toString() );
+ File file = new File( filename );
if ( file.isDirectory() )
{
@@ -619,7 +618,7 @@ public class FixJavadocMojoTest
private void invokeCompileGoal( File testPom, Log log )
throws MavenInvocationException
{
- List goals = new ArrayList();
+ List<String> goals = new ArrayList<String>();
goals.add( "clean" );
goals.add( "compile" );
File invokerDir = new File( getBasedir(), "target/invoker" );
@@ -665,10 +664,10 @@ public class FixJavadocMojoTest
.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(); )
+ List<String> scmFiles = FileUtils.getDirectoryNames( testPomBasedir, "**/.svn", null, true );
+ for ( String filename : scmFiles )
{
- File dir = new File( it.next().toString() );
+ File dir = new File( filename );
if ( dir.isDirectory() )
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java Sun Aug 15 21:37:47 2010
@@ -55,10 +55,10 @@ public class JavadocJarTest
//validate contents of jar file
ZipFile jar = new ZipFile( generatedFile );
- Set set = new HashSet();
- for( Enumeration entries = jar.getEntries(); entries.hasMoreElements(); )
+ Set<String> set = new HashSet<String>();
+ for( Enumeration<ZipEntry> entries = jar.getEntries(); entries.hasMoreElements(); )
{
- ZipEntry entry = ( ZipEntry ) entries.nextElement();
+ ZipEntry entry = entries.nextElement();
set.add( entry.getName() );
}
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=985765&r1=985764&r2=985765&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 Sun Aug 15 21:37:47 2010
@@ -25,7 +25,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -121,12 +120,12 @@ public class JavadocReportTest
FileUtils.copyDirectoryStructure( sourceDir, localRepo );
// Remove SCM files
- List files =
+ List<String> files =
FileUtils.getFileAndDirectoryNames( localRepo, FileUtils.getDefaultExcludesAsString(), null, true,
true, true, true );
- for ( Iterator it = files.iterator(); it.hasNext(); )
+ for ( String filename : files )
{
- File file = new File( it.next().toString() );
+ File file = new File( filename );
if ( file.isDirectory() )
{
@@ -989,7 +988,7 @@ public class JavadocReportTest
}
// auth proxy
- Map authentications = new HashMap();
+ Map<String, String> authentications = new HashMap<String, String>();
authentications.put( "foo", "bar" );
try
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java Sun Aug 15 21:37:47 2010
@@ -350,7 +350,7 @@ public class JavadocUtilTest
}
}
- Map authentications = new HashMap();
+ Map<String, String> authentications = new HashMap<String, String>();
authentications.put( "foo", "bar" );
// wrong auth
try
@@ -511,7 +511,7 @@ public class JavadocUtilTest
assertTrue( output.mkdirs() );
JavadocUtil.copyJavadocResources( output, input, null );
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" + File.separator
+ "sample-excluded1.gif" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir2" + File.separator
@@ -521,7 +521,7 @@ public class JavadocUtilTest
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" + File.separator
+ "sample-included2.gif" );
assertTrue( EqualsBuilder.reflectionEquals( expected, FileUtils.getFiles( output, null, null, false ) ) );
- expected = new ArrayList();
+ expected = new ArrayList<String>();
expected.add( "" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" );
@@ -543,13 +543,13 @@ public class JavadocUtilTest
assertTrue( output.mkdirs() );
JavadocUtil.copyJavadocResources( output, input, "excluded-dir1:excluded-dir2" );
- expected = new ArrayList();
+ expected = new ArrayList<String>();
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir1" + File.separator
+ "sample-included1.gif" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" + File.separator
+ "sample-included2.gif" );
assertTrue( EqualsBuilder.reflectionEquals( expected, FileUtils.getFiles( output, null, null, false ) ) );
- expected = new ArrayList();
+ expected = new ArrayList<String>();
expected.add( "" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir1" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" );
@@ -567,12 +567,12 @@ public class JavadocUtilTest
public void testPruneDirs()
throws Exception
{
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add( getBasedir() + "/target/classes" );
list.add( getBasedir() + "/target/classes" );
list.add( getBasedir() + "/target/classes" );
- List expected = new ArrayList();
+ List<String> expected = new ArrayList<String>();
expected.add( getBasedir() + "/target/classes" );
assertTrue( EqualsBuilder.reflectionEquals( expected, JavadocUtil.pruneDirs( null, list ) ) );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java Sun Aug 15 21:37:47 2010
@@ -149,7 +149,7 @@ class ProxyServer
static class AuthAsyncProxyServlet
extends AsyncProxyServlet
{
- private Map authentications;
+ private Map<String, String> authentications;
private long sleepTime = 0;
@@ -166,7 +166,7 @@ class ProxyServer
*
* @param authentications a map of user/password
*/
- public AuthAsyncProxyServlet( Map authentications )
+ public AuthAsyncProxyServlet( Map<String, String> authentications )
{
this();
@@ -179,7 +179,7 @@ class ProxyServer
* @param authentications a map of user/password
* @param sleepTime a positive time to sleep the service thread (for timeout)
*/
- public AuthAsyncProxyServlet( Map authentications, long sleepTime )
+ public AuthAsyncProxyServlet( Map<String, String> authentications, long sleepTime )
{
this();
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject1TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject1TestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject1TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject1TestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -21,17 +21,12 @@ package org.apache.maven.plugin.javadoc.
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Build;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
/**
* @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
@@ -40,8 +35,6 @@ import org.apache.maven.project.artifact
public class AggregateProject1TestMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public AggregateProject1TestMavenProjectStub()
{
setGroupId( "org.apache.maven.plugins.maven-javadoc-plugin.unit" );
@@ -54,36 +47,18 @@ public class AggregateProject1TestMavenP
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
setArtifact( artifact );
- build = new Build();
+ Build build = new Build();
build.setFinalName( "aggregate-test-project1" );
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-test/target" );
+ setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir + "/aggregate/test/project1" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
- public Set createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter )
- throws InvalidDependencyVersionException
- {
- return Collections.EMPTY_SET;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-test/project1" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject2TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject2TestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject2TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject2TestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -21,17 +21,12 @@ package org.apache.maven.plugin.javadoc.
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Build;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
/**
* @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
@@ -40,8 +35,6 @@ import org.apache.maven.project.artifact
public class AggregateProject2TestMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public AggregateProject2TestMavenProjectStub()
{
setGroupId( "org.apache.maven.plugins.maven-javadoc-plugin.unit" );
@@ -54,36 +47,18 @@ public class AggregateProject2TestMavenP
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
setArtifact( artifact );
- build = new Build();
+ Build build = new Build();
build.setFinalName( "aggregate-test-project2" );
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-test/target" );
+ setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir + "/aggregate/test/project2" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
- public Set createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter )
- throws InvalidDependencyVersionException
- {
- return Collections.EMPTY_SET;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-test/project2" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -21,17 +21,12 @@ package org.apache.maven.plugin.javadoc.
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Build;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -40,8 +35,6 @@ import org.apache.maven.project.artifact
public class AggregateResourcesProject1TestMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public AggregateResourcesProject1TestMavenProjectStub()
{
readModel( new File( getBasedir(), "pom.xml" ) );
@@ -65,37 +58,18 @@ public class AggregateResourcesProject1T
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-resources-test/project1/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir().getAbsolutePath() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-resources-test/project1" );
}
/** {@inheritDoc} */
- public Set createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter )
- throws InvalidDependencyVersionException
- {
- return Collections.EMPTY_SET;
- }
-
- /** {@inheritDoc} */
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -21,17 +21,12 @@ package org.apache.maven.plugin.javadoc.
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Build;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -40,8 +35,6 @@ import org.apache.maven.project.artifact
public class AggregateResourcesProject2TestMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public AggregateResourcesProject2TestMavenProjectStub()
{
readModel( new File( getBasedir(), "pom.xml" ) );
@@ -65,37 +58,18 @@ public class AggregateResourcesProject2T
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-resources-test/project2/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-resources-test/project2" );
}
/** {@inheritDoc} */
- public Set createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter )
- throws InvalidDependencyVersionException
- {
- return Collections.EMPTY_SET;
- }
-
- /** {@inheritDoc} */
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -21,16 +21,11 @@ package org.apache.maven.plugin.javadoc.
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Set;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Build;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -39,8 +34,6 @@ import org.apache.maven.project.artifact
public class AggregateResourcesTestMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public AggregateResourcesTestMavenProjectStub()
{
readModel( new File( getBasedir(), "aggregate-resources-test-plugin-config.xml" ) );
@@ -60,36 +53,17 @@ public class AggregateResourcesTestMaven
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-resources-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-resources-test" );
}
/** {@inheritDoc} */
- public Set createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter )
- throws InvalidDependencyVersionException
- {
- return Collections.EMPTY_SET;
- }
-
- /** {@inheritDoc} */
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -52,7 +52,7 @@ public class AggregateTestMavenProjectSt
build.setFinalName( getModel().getArtifactId() );
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-test/target" );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/CustomConfigurationMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/CustomConfigurationMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/CustomConfigurationMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/CustomConfigurationMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -61,7 +61,7 @@ public class CustomConfigurationMavenPro
build.setDirectory( super.getBasedir() + "/target/test/unit/custom-configuration/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
String temp = getBasedir().getAbsolutePath();
if( !temp.startsWith( "/" ) )
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DefaultConfigurationMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DefaultConfigurationMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DefaultConfigurationMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DefaultConfigurationMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class DefaultConfigurationMavenPr
{
private Scm scm;
- private Build build;
-
public DefaultConfigurationMavenProjectStub()
{
readModel( new File( getBasedir(), "default-configuration-plugin-config.xml" ) );
@@ -58,7 +56,7 @@ public class DefaultConfigurationMavenPr
build.setDirectory( super.getBasedir() + "/target/test/unit/default-configuration/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/def/configuration" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -76,18 +74,6 @@ public class DefaultConfigurationMavenPr
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/default-configuration/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class DocfilesTestMavenProjectStu
{
private Scm scm;
- private Build build;
-
public DocfilesTestMavenProjectStub()
{
readModel( new File( getBasedir(), "docfiles-test-plugin-config.xml" ) );
@@ -59,7 +57,7 @@ public class DocfilesTestMavenProjectStu
build.setDirectory( super.getBasedir() + "/target/test/unit/docfiles-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/docfiles/test" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -77,18 +75,6 @@ public class DocfilesTestMavenProjectStu
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/docfiles-test/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.javadoc.
*/
import org.apache.maven.model.Build;
-import org.apache.maven.model.Scm;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import java.io.File;
@@ -34,8 +33,6 @@ import java.util.List;
public class DocfilesWithJavaTestMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public DocfilesWithJavaTestMavenProjectStub()
{
readModel( new File( getBasedir(), "docfiles-with-java-test-plugin-config.xml" ) );
@@ -50,24 +47,12 @@ public class DocfilesWithJavaTestMavenPr
build.setDirectory( super.getBasedir() + "/target/test/unit/docfiles-with-java-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/docfiles-with-java-test/src/main" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir(), "/src/test/resources/unit/docfiles-with-java-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletPathTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletPathTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletPathTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletPathTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class DocletPathTestMavenProjectS
{
private Scm scm;
- private Build build;
-
public DocletPathTestMavenProjectStub()
{
readModel( new File( getBasedir(), "doclet-path-test-plugin-config.xml" ) );
@@ -58,7 +56,7 @@ public class DocletPathTestMavenProjectS
build.setDirectory( super.getBasedir() + "/target/test/unit/doclet-path-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/doclet/test" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -76,18 +74,6 @@ public class DocletPathTestMavenProjectS
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/doclet-path-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class DocletTestMavenProjectStub
{
private Scm scm;
- private Build build;
-
public DocletTestMavenProjectStub()
{
readModel( new File( getBasedir(), "doclet-test-plugin-config.xml" ) );
@@ -59,7 +57,7 @@ public class DocletTestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/doclet-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/doclet/test" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -77,18 +75,6 @@ public class DocletTestMavenProjectStub
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/doclet-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HeaderFooterTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HeaderFooterTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HeaderFooterTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HeaderFooterTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class HeaderFooterTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public HeaderFooterTestMavenProjectStub()
{
readModel( new File( getBasedir(), "header-footer-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class HeaderFooterTestMavenProjec
build.setDirectory( super.getBasedir() + "/target/test/unit/header-footer-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/header-footer-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HelpFileMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HelpFileMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HelpFileMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/HelpFileMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -37,8 +37,6 @@ import java.util.List;
*/
public class HelpFileMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public HelpFileMavenProjectStub()
{
readModel( new File( getBasedir(), "pom.xml" ) );
@@ -61,31 +59,19 @@ public class HelpFileMavenProjectStub ex
build.setPlugins( getModel().getBuild().getPlugins() );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/helpfile-test" );
}
/** {@inheritDoc} */
- public List getRemoteArtifactRepositories()
+ public List<ArtifactRepository> getRemoteArtifactRepositories()
{
ArtifactRepository repository =
new DefaultArtifactRepository( "central", "http://repo1.maven.org/maven2",
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class JavadocJarDefaultMavenProje
{
private Scm scm;
- private Build build;
-
public JavadocJarDefaultMavenProjectStub()
{
readModel( new File( getBasedir(), "javadocjar-default-plugin-config.xml" ) );
@@ -65,7 +63,7 @@ public class JavadocJarDefaultMavenProje
build.setDirectory( super.getBasedir() + "/target/test/unit/javadocjar-default/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/javadocjar/def" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -83,18 +81,6 @@ public class JavadocJarDefaultMavenProje
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/javadocjar-default" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -37,8 +37,6 @@ public class JavadocJarInvalidDestdirMav
{
private Scm scm;
- private Build build;
-
public JavadocJarInvalidDestdirMavenProjectStub()
{
readModel( new File( getBasedir(), "javadocjar-invalid-destdir-plugin-config.xml" ) );
@@ -64,7 +62,7 @@ public class JavadocJarInvalidDestdirMav
build.setDirectory( super.getBasedir() + "/target/test/unit/javadocjar-invalid-destdir/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add(
getBasedir() + "/javadocjar/invalid/destdir" );
setCompileSourceRoots( compileSourceRoots );
@@ -83,18 +81,6 @@ public class JavadocJarInvalidDestdirMav
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/javadocjar-invalid-destdir/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk5TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk5TestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk5TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk5TestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class Jdk5TestMavenProjectStub
{
private Scm scm;
- private Build build;
-
public Jdk5TestMavenProjectStub()
{
readModel( new File( getBasedir(), "jdk5-test-plugin-config.xml" ) );
@@ -58,7 +56,7 @@ public class Jdk5TestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/jdk5-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir().getAbsolutePath() );
setCompileSourceRoots( compileSourceRoots );
}
@@ -76,18 +74,6 @@ public class Jdk5TestMavenProjectStub
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/jdk5-test/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class Jdk6TestMavenProjectStub
{
private Scm scm;
- private Build build;
-
public Jdk6TestMavenProjectStub()
{
readModel( new File( getBasedir(), "jdk6-test-plugin-config.xml" ) );
@@ -58,7 +56,7 @@ public class Jdk6TestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/jdk6-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir().getAbsolutePath() );
setCompileSourceRoots( compileSourceRoots );
}
@@ -76,28 +74,8 @@ public class Jdk6TestMavenProjectStub
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/jdk6-test/" );
}
-
- public List getCompileSourceRoots()
- {
- List sourceRoots = super.getCompileSourceRoots();
- return sourceRoots;
- }
-
-
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/NewlineTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/NewlineTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/NewlineTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/NewlineTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class NewlineTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public NewlineTestMavenProjectStub()
{
readModel( new File( getBasedir(), "newline-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class NewlineTestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/newline-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/newline-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/PomMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/PomMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/PomMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/PomMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -33,8 +33,6 @@ import org.apache.maven.plugin.testing.s
public class PomMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public PomMavenProjectStub()
{
readModel( new File( getBasedir(), "pom-test-plugin-config.xml" ) );
@@ -55,28 +53,16 @@ public class PomMavenProjectStub
build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/pom-test/target/test-classes" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
+ List<String> testCompileSourceRoots = new ArrayList<String>();
testCompileSourceRoots.add( getBasedir() + "/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/pom-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ProxyTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class ProxyTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public ProxyTestMavenProjectStub()
{
readModel( new File( getBasedir(), "proxy-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class ProxyTestMavenProjectStub e
build.setDirectory( super.getBasedir() + "/target/test/unit/proxy-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/proxy-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/QuotedPathMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/QuotedPathMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/QuotedPathMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/QuotedPathMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,13 +36,10 @@ public class QuotedPathMavenProjectStub
{
private Scm scm;
- private Build build;
-
public QuotedPathMavenProjectStub()
{
readModel( new File( getBasedir(), "quotedpath-test-plugin-config.xml" ) );
-
setGroupId( "org.apache.maven.plugins.maven-javadoc-plugin.unit" );
setArtifactId( "quotedpath-test" );
setVersion( "1.0-SNAPSHOT" );
@@ -59,7 +56,7 @@ public class QuotedPathMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/quotedpath'test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/quotedpath/test" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -77,18 +74,6 @@ public class QuotedPathMavenProjectStub
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/quotedpath'test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class ResourcesTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public ResourcesTestMavenProjectStub()
{
readModel( new File( getBasedir(), "resources-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class ResourcesTestMavenProjectSt
build.setDirectory( super.getBasedir() + "/target/test/unit/resources-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/resources-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class ResourcesWithExcludesTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public ResourcesWithExcludesTestMavenProjectStub()
{
readModel( new File( getBasedir(), "resources-with-excludes-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class ResourcesWithExcludesTestMa
build.setDirectory( super.getBasedir() + "/target/test/unit/resources-with-excludes-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/resources-with-excludes-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SettingsStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SettingsStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SettingsStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SettingsStub.java Sun Aug 15 21:37:47 2010
@@ -47,7 +47,7 @@ public class SettingsStub
}
/** {@inheritDoc} */
- public List getProxies()
+ public List<Proxy> getProxies()
{
return Collections.singletonList( getActiveProxy() );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class StandardDocletConflictOptionsTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public StandardDocletConflictOptionsTestMavenProjectStub()
{
readModel( new File( getBasedir(), "conflict-options-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class StandardDocletConflictOptio
build.setDirectory( super.getBasedir() + "/target/test/unit/validate-options-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/validate-options-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StylesheetFileMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StylesheetFileMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StylesheetFileMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/StylesheetFileMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -37,8 +37,6 @@ import java.util.List;
*/
public class StylesheetFileMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public StylesheetFileMavenProjectStub()
{
readModel( new File( getBasedir(), "pom.xml" ) );
@@ -61,31 +59,19 @@ public class StylesheetFileMavenProjectS
build.setPlugins( getModel().getBuild().getPlugins() );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/stylesheetfile-test" );
}
/** {@inheritDoc} */
- public List getRemoteArtifactRepositories()
+ public List<ArtifactRepository> getRemoteArtifactRepositories()
{
ArtifactRepository repository =
new DefaultArtifactRepository( "central", "http://repo1.maven.org/maven2",
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SubpackagesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SubpackagesTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SubpackagesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SubpackagesTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class SubpackagesTestMavenProject
{
private Scm scm;
- private Build build;
-
public SubpackagesTestMavenProjectStub()
{
readModel( new File( getBasedir(), "subpackages-test-plugin-config.xml" ) );
@@ -58,7 +56,7 @@ public class SubpackagesTestMavenProject
build.setDirectory( super.getBasedir() + "/target/test/unit/subpackages-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/subpackages/test" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -76,18 +74,6 @@ public class SubpackagesTestMavenProject
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/subpackages-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class TagTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public TagTestMavenProjectStub()
{
readModel( new File( getBasedir(), "tag-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class TagTestMavenProjectStub ext
build.setDirectory( super.getBasedir() + "/target/test/unit/tag-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/tag-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletArtifactsMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletArtifactsMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletArtifactsMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletArtifactsMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -37,8 +37,6 @@ import org.apache.maven.plugin.testing.s
public class TagletArtifactsMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
/**
* Default constructor.
*/
@@ -59,25 +57,13 @@ public class TagletArtifactsMavenProject
build.setDirectory( super.getBasedir() + "/target/test/unit/tagletArtifacts-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
- public List getRemoteArtifactRepositories()
+ public List<ArtifactRepository> getRemoteArtifactRepositories()
{
ArtifactRepository repository =
new DefaultArtifactRepository( "central", "http://repo1.maven.org/maven2",
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TagletTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -36,8 +36,6 @@ public class TagletTestMavenProjectStub
{
private Scm scm;
- private Build build;
-
public TagletTestMavenProjectStub()
{
readModel( new File( getBasedir(), "taglet-test-plugin-config.xml" ) );
@@ -58,7 +56,7 @@ public class TagletTestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/taglet-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/taglet/test" );
setCompileSourceRoots( compileSourceRoots );
}
@@ -76,18 +74,6 @@ public class TagletTestMavenProjectStub
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/taglet-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TestJavadocMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TestJavadocMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TestJavadocMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/TestJavadocMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -23,18 +23,14 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Build;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -43,8 +39,6 @@ import org.apache.maven.project.artifact
public class TestJavadocMavenProjectStub
extends MavenProjectStub
{
- private Build build;
-
public TestJavadocMavenProjectStub()
{
readModel( new File( getBasedir(), "test-javadoc-test-plugin-config.xml" ) );
@@ -71,41 +65,22 @@ public class TestJavadocMavenProjectStub
build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/test-javadoc-test/target/test-classes" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
+ List<String> testCompileSourceRoots = new ArrayList<String>();
testCompileSourceRoots.add( getBasedir() + "/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/test-javadoc-test" );
}
/** {@inheritDoc} */
- public Set createArtifacts( ArtifactFactory artifactFactory, String string, ArtifactFilter artifactFilter )
- throws InvalidDependencyVersionException
- {
- return Collections.EMPTY_SET;
- }
-
- /** {@inheritDoc} */
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java?rev=985765&r1=985764&r2=985765&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java Sun Aug 15 21:37:47 2010
@@ -32,8 +32,6 @@ import java.util.List;
*/
public class WrongEncodingOptionsTestMavenProjectStub extends MavenProjectStub
{
- private Build build;
-
public WrongEncodingOptionsTestMavenProjectStub()
{
readModel( new File( getBasedir(), "wrong-encoding-test-plugin-config.xml" ) );
@@ -51,24 +49,12 @@ public class WrongEncodingOptionsTestMav
build.setDirectory( super.getBasedir() + "/target/test/unit/validate-options-test/target" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
- public Build getBuild()
- {
- return build;
- }
-
- /** {@inheritDoc} */
- public void setBuild( Build build )
- {
- this.build = build;
- }
-
- /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/validate-options-test" );