Author: hboutemy
Date: Tue Jun 22 20:55:43 2010
New Revision: 957028
URL: http://svn.apache.org/viewvc?rev=957028&view=rev
Log:
[MSHARED-157] upgraded compiler plugin to Java 5, and used Java 5 generics
Modified:
maven/shared/trunk/maven-doxia-tools/pom.xml
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/ReportComparator.java
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
Modified: maven/shared/trunk/maven-doxia-tools/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=957028&r1=957027&r2=957028&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/pom.xml (original)
+++ maven/shared/trunk/maven-doxia-tools/pom.xml Tue Jun 22 20:55:43 2010
@@ -36,7 +36,7 @@
<description>A collection of tools to help the integration of Doxia in Maven
plugins.</description>
<prerequisites>
- <maven>2.0.6</maven>
+ <maven>2.2.1</maven>
</prerequisites>
<scm>
@@ -53,7 +53,7 @@
<properties>
<doxiaVersion>1.1.3</doxiaVersion>
<doxiaSitetoolsVersion>1.1.3</doxiaSitetoolsVersion>
- <mavenVersion>2.0.6</mavenVersion>
+ <mavenVersion>2.2.1</mavenVersion>
</properties>
<dependencies>
@@ -143,6 +143,18 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=957028&r1=957027&r2=957028&view=diff
==============================================================================
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Tue Jun 22 20:55:43 2010
@@ -123,7 +123,8 @@ public class DefaultSiteTool
// ----------------------------------------------------------------------
/** {...@inheritdoc} */
- public Artifact getSkinArtifactFromRepository( ArtifactRepository
localRepository, List remoteArtifactRepositories,
+ public Artifact getSkinArtifactFromRepository( ArtifactRepository
localRepository,
+ List<ArtifactRepository>
remoteArtifactRepositories,
DecorationModel decoration )
throws SiteToolException
{
@@ -179,7 +180,8 @@ public class DefaultSiteTool
}
/** {...@inheritdoc} */
- public Artifact getDefaultSkinArtifact( ArtifactRepository
localRepository, List remoteArtifactRepositories )
+ public Artifact getDefaultSkinArtifact( ArtifactRepository localRepository,
+ List<ArtifactRepository>
remoteArtifactRepositories )
throws SiteToolException
{
return getSkinArtifactFromRepository( localRepository,
remoteArtifactRepositories, new DecorationModel() );
@@ -424,7 +426,7 @@ public class DefaultSiteTool
/** {...@inheritdoc} */
public File getSiteDescriptorFromRepository( MavenProject project,
ArtifactRepository localRepository,
- List repositories, Locale
locale )
+ List<ArtifactRepository>
repositories, Locale locale )
throws SiteToolException
{
if ( project == null )
@@ -466,10 +468,10 @@ public class DefaultSiteTool
}
/** {...@inheritdoc} */
- public DecorationModel getDecorationModel( MavenProject project, List
reactorProjects,
- ArtifactRepository
localRepository, List repositories,
- String siteDirectory, Locale
locale, String inputEncoding,
- String outputEncoding )
+ public DecorationModel getDecorationModel( MavenProject project,
List<MavenProject> reactorProjects,
+ ArtifactRepository
localRepository,
+ List<ArtifactRepository>
repositories, String siteDirectory,
+ Locale locale, String
inputEncoding, String outputEncoding )
throws SiteToolException
{
if ( project == null )
@@ -502,7 +504,7 @@ public class DefaultSiteTool
locale = Locale.getDefault();
}
- Map props = new HashMap();
+ Map<String, String> props = new HashMap<String, String>();
// This is to support the deprecated ${reports} and ${modules} tags.
props.put( "reports", "<menu ref=\"reports\"/>\n" );
@@ -563,7 +565,8 @@ public class DefaultSiteTool
}
/** {...@inheritdoc} */
- public void populateReportsMenu( DecorationModel decorationModel, Locale
locale, Map categories )
+ public void populateReportsMenu( DecorationModel decorationModel, Locale
locale,
+ Map<String, List<MavenReport>> categories
)
{
if ( decorationModel == null )
{
@@ -591,7 +594,7 @@ public class DefaultSiteTool
boolean found = false;
if ( menu.getItems().isEmpty() )
{
- List categoryReports = (List) categories.get(
MavenReport.CATEGORY_PROJECT_INFORMATION );
+ List<MavenReport> categoryReports = categories.get(
MavenReport.CATEGORY_PROJECT_INFORMATION );
if ( !isEmptyList( categoryReports ) )
{
MenuItem item = createCategoryMenu( i18n.getString(
"site-tool", locale,
@@ -601,7 +604,7 @@ public class DefaultSiteTool
found = true;
}
- categoryReports = (List) categories.get(
MavenReport.CATEGORY_PROJECT_REPORTS );
+ categoryReports = categories.get(
MavenReport.CATEGORY_PROJECT_REPORTS );
if ( !isEmptyList( categoryReports ) )
{
MenuItem item = createCategoryMenu( i18n.getString(
"site-tool", locale,
@@ -619,8 +622,9 @@ public class DefaultSiteTool
}
/** {...@inheritdoc} */
- public String getInterpolatedSiteDescriptorContent( Map props,
MavenProject aProject, String siteDescriptorContent,
- String inputEncoding,
String outputEncoding )
+ public String getInterpolatedSiteDescriptorContent( Map<String, String>
props, MavenProject aProject,
+ String
siteDescriptorContent, String inputEncoding,
+ String outputEncoding )
throws SiteToolException
{
if ( props == null )
@@ -648,7 +652,7 @@ public class DefaultSiteTool
// ${modules} to aProject.getModules(), so we need to interpolate that
// first.
- Map modulesProps = new HashMap();
+ Map<String, String> modulesProps = new HashMap<String, String>();
// Legacy for the old ${modules} syntax
modulesProps.put( "modules", "<menu ref=\"modules\"/>" );
@@ -688,7 +692,7 @@ public class DefaultSiteTool
}
/** {...@inheritdoc} */
- public MavenProject getParentProject( MavenProject aProject, List
reactorProjects,
+ public MavenProject getParentProject( MavenProject aProject,
List<MavenProject> reactorProjects,
ArtifactRepository localRepository )
{
if ( aProject == null )
@@ -709,12 +713,8 @@ public class DefaultSiteTool
MavenProject origParent = aProject.getParent();
if ( origParent != null )
{
- Iterator reactorItr = reactorProjects.iterator();
-
- while ( reactorItr.hasNext() )
+ for ( MavenProject reactorProject : reactorProjects )
{
- MavenProject reactorProject = (MavenProject) reactorItr.next();
-
if ( reactorProject.getGroupId().equals(
origParent.getGroupId() )
&& reactorProject.getArtifactId().equals(
origParent.getArtifactId() )
&& reactorProject.getVersion().equals(
origParent.getVersion() ) )
@@ -875,16 +875,18 @@ public class DefaultSiteTool
* {...@link #populateModulesMenu(MavenProject, List,
ArtifactRepository, DecorationModel, Locale, boolean)}
* instead
*/
- public void populateModules( MavenProject project, List reactorProjects,
ArtifactRepository localRepository,
- DecorationModel decorationModel, Locale
locale, boolean keepInheritedRefs )
+ public void populateModules( MavenProject project, List<MavenProject>
reactorProjects,
+ ArtifactRepository localRepository,
DecorationModel decorationModel, Locale locale,
+ boolean keepInheritedRefs )
throws SiteToolException
{
populateModulesMenu( project, reactorProjects, localRepository,
decorationModel, locale, keepInheritedRefs );
}
/** {...@inheritdoc} */
- public void populateModulesMenu( MavenProject project, List
reactorProjects, ArtifactRepository localRepository,
- DecorationModel decorationModel, Locale
locale, boolean keepInheritedRefs )
+ public void populateModulesMenu( MavenProject project, List<MavenProject>
reactorProjects,
+ ArtifactRepository localRepository,
DecorationModel decorationModel,
+ Locale locale, boolean keepInheritedRefs )
throws SiteToolException
{
if ( project == null )
@@ -921,7 +923,7 @@ public class DefaultSiteTool
// we require child modules and reactors to process module menu
if ( project.getModules().size() > 0 )
{
- List projects = reactorProjects;
+ List<MavenProject> projects = reactorProjects;
if ( menu.getName() == null )
{
@@ -933,10 +935,10 @@ public class DefaultSiteTool
getLogger().debug( "Attempting to load module information
from local filesystem" );
// Not running reactor - search for the projects manually
- List models = new ArrayList( project.getModules().size() );
- for ( Iterator i = project.getModules().iterator();
i.hasNext(); )
+ List<Model> models = new ArrayList<Model>(
project.getModules().size() );
+ for ( Iterator<String> i =
project.getModules().iterator(); i.hasNext(); )
{
- String module = (String) i.next();
+ String module = i.next();
Model model;
File f = new File( project.getBasedir(), module +
"/pom.xml" );
if ( f.exists() )
@@ -975,9 +977,9 @@ public class DefaultSiteTool
}
/** {...@inheritdoc} */
- public List getAvailableLocales( String locales )
+ public List<Locale> getAvailableLocales( String locales )
{
- List localesList = new ArrayList();
+ List<Locale> localesList = new ArrayList<Locale>();
if ( locales != null )
{
String[] localesArray = StringUtils.split( locales, "," );
@@ -1115,8 +1117,8 @@ public class DefaultSiteTool
* @throws ArtifactResolutionException if any
* @throws ArtifactNotFoundException if any
*/
- private File resolveSiteDescriptor( MavenProject project,
ArtifactRepository localRepository, List repositories,
- Locale locale )
+ private File resolveSiteDescriptor( MavenProject project,
ArtifactRepository localRepository,
+ List<ArtifactRepository> repositories,
Locale locale )
throws IOException, ArtifactResolutionException,
ArtifactNotFoundException
{
File result;
@@ -1199,13 +1201,14 @@ public class DefaultSiteTool
* @return the decoration model depending the locale
* @throws SiteToolException if any
*/
- private DecorationModel getDecorationModel( MavenProject project, List
reactorProjects,
- ArtifactRepository
localRepository, List repositories,
- String siteDirectory, Locale
locale, Map origProps,
- String inputEncoding, String
outputEncoding )
+ private DecorationModel getDecorationModel( MavenProject project,
List<MavenProject> reactorProjects,
+ ArtifactRepository
localRepository,
+ List<ArtifactRepository>
repositories, String siteDirectory,
+ Locale locale, Map<String,
String> origProps, String inputEncoding,
+ String outputEncoding )
throws SiteToolException
{
- Map props = new HashMap( origProps );
+ Map<String, String> props = new HashMap<String, String>( origProps );
File siteDescriptor;
if ( project.getBasedir() == null )
@@ -1309,13 +1312,11 @@ public class DefaultSiteTool
* @param reactorProjects not null
* @param menu not null
*/
- private void populateModulesMenuItemsFromReactorProjects( MavenProject
project, List reactorProjects, Menu menu )
+ private void populateModulesMenuItemsFromReactorProjects( MavenProject
project, List<MavenProject> reactorProjects,
+ Menu menu )
{
- Iterator iterator = getModuleProjects( project, reactorProjects, 1
).iterator();
- while ( iterator.hasNext() )
+ for ( MavenProject moduleProject : getModuleProjects( project,
reactorProjects, 1 ) )
{
- MavenProject moduleProject = (MavenProject) iterator.next();
-
appendMenuItem( project, menu, moduleProject.getName(),
moduleProject.getUrl(),
moduleProject.getArtifactId() );
}
@@ -1338,19 +1339,17 @@ public class DefaultSiteTool
* @param levels the number of descendant levels to return
* @return the list of module projects.
*/
- private List getModuleProjects( final MavenProject project, final List
reactorProjects, final int levels )
+ private List<MavenProject> getModuleProjects( final MavenProject project,
final List<MavenProject> reactorProjects,
+ final int levels )
{
- List moduleProjects = new ArrayList();
+ List<MavenProject> moduleProjects = new ArrayList<MavenProject>();
boolean infinite = ( levels == -1 );
if ( ( reactorProjects != null ) && ( infinite || levels > 0 ) )
{
- Iterator iterator = reactorProjects.iterator();
- while ( iterator.hasNext() )
+ for ( MavenProject reactorProject : reactorProjects )
{
- MavenProject reactorProject = (MavenProject) iterator.next();
-
if ( isModuleOfProject( project, reactorProject ) )
{
moduleProjects.add( reactorProject );
@@ -1376,17 +1375,14 @@ public class DefaultSiteTool
{
boolean result = false;
- List modules = parentProject.getModules();
+ List<String> modules = parentProject.getModules();
if ( modules != null && parentProject != potentialModule )
{
File parentBaseDir = parentProject.getBasedir();
- Iterator iterator = modules.iterator();
- while ( iterator.hasNext() )
+ for ( String module : modules )
{
- String module = (String) iterator.next();
-
File moduleBaseDir = new File( parentBaseDir, module );
try
@@ -1416,16 +1412,12 @@ public class DefaultSiteTool
* @param models not null
* @param menu not null
*/
- private void populateModulesMenuItemsFromModels( MavenProject project,
List models, Menu menu )
+ private void populateModulesMenuItemsFromModels( MavenProject project,
List<Model> models, Menu menu )
{
if ( models != null && models.size() > 1 )
{
- Iterator reactorItr = models.iterator();
-
- while ( reactorItr.hasNext() )
+ for ( Model model : models )
{
- Model model = (Model) reactorItr.next();
-
String reactorUrl = model.getUrl();
String name = model.getName();
@@ -1477,7 +1469,7 @@ public class DefaultSiteTool
* @param locale not null
* @return the menu item object
*/
- private MenuItem createCategoryMenu( String name, String href, List
categoryReports, Locale locale )
+ private MenuItem createCategoryMenu( String name, String href,
List<MavenReport> categoryReports, Locale locale )
{
MenuItem item = new MenuItem();
item.setName( name );
@@ -1486,10 +1478,8 @@ public class DefaultSiteTool
Collections.sort( categoryReports, new ReportComparator( locale ) );
- for ( Iterator k = categoryReports.iterator(); k.hasNext(); )
+ for ( MavenReport report : categoryReports )
{
- MavenReport report = (MavenReport) k.next();
-
MenuItem subitem = new MenuItem();
subitem.setName( report.getName( locale ) );
subitem.setHref( report.getOutputName() + ".html" );
@@ -1509,7 +1499,7 @@ public class DefaultSiteTool
* @param list could be null
* @return true if the list is <code>null</code> or empty
*/
- private static boolean isEmptyList( List list )
+ private static boolean isEmptyList( List<?> list )
{
return list == null || list.isEmpty();
}
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/ReportComparator.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/ReportComparator.java?rev=957028&r1=957027&r2=957028&view=diff
==============================================================================
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/ReportComparator.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/ReportComparator.java
Tue Jun 22 20:55:43 2010
@@ -34,7 +34,7 @@ import java.util.Locale;
* @todo allow reports to define their order in some other way?
*/
public class ReportComparator
- implements Comparator
+ implements Comparator<MavenReport>
{
/** the local */
private final Locale locale;
@@ -54,11 +54,8 @@ public class ReportComparator
}
/** {...@inheritdoc} */
- public int compare( Object o1, Object o2 )
+ public int compare( MavenReport r1, MavenReport r2 )
{
- MavenReport r1 = (MavenReport) o1;
- MavenReport r2 = (MavenReport) o2;
-
Collator collator = Collator.getInstance( locale );
return collator.compare( r1.getName( locale ), r2.getName( locale ) );
}
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java?rev=957028&r1=957027&r2=957028&view=diff
==============================================================================
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Tue Jun 22 20:55:43 2010
@@ -28,6 +28,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.reporting.MavenReport;
/**
* Tool to play with <a href="http://maven.apache.org/doxia/";>Doxia</a> objects
@@ -57,7 +58,8 @@ public interface SiteTool
* local repository
* @throws SiteToolException if any
*/
- Artifact getSkinArtifactFromRepository( ArtifactRepository
localRepository, List remoteArtifactRepositories,
+ Artifact getSkinArtifactFromRepository( ArtifactRepository localRepository,
+ List<ArtifactRepository>
remoteArtifactRepositories,
DecorationModel decoration )
throws SiteToolException;
@@ -71,7 +73,8 @@ public interface SiteTool
* @see org.apache.maven.doxia.site.decoration.Skin#getDefaultSkin()
* @see #getSkinArtifactFromRepository(ArtifactRepository, List,
DecorationModel)
*/
- Artifact getDefaultSkinArtifact( ArtifactRepository localRepository, List
remoteArtifactRepositories )
+ Artifact getDefaultSkinArtifact( ArtifactRepository localRepository,
+ List<ArtifactRepository>
remoteArtifactRepositories )
throws SiteToolException;
/**
@@ -120,8 +123,8 @@ public interface SiteTool
* found in repositories.
* @throws SiteToolException if any
*/
- File getSiteDescriptorFromRepository( MavenProject project,
ArtifactRepository localRepository, List repositories,
- Locale locale )
+ File getSiteDescriptorFromRepository( MavenProject project,
ArtifactRepository localRepository,
+ List<ArtifactRepository>
repositories, Locale locale )
throws SiteToolException;
/**
@@ -140,9 +143,9 @@ public interface SiteTool
* interpolations.
* @throws SiteToolException if any
*/
- DecorationModel getDecorationModel( MavenProject project, List
reactorProjects, ArtifactRepository localRepository,
- List repositories, String
siteDirectory, Locale locale, String inputEncoding,
- String outputEncoding )
+ DecorationModel getDecorationModel( MavenProject project,
List<MavenProject> reactorProjects,
+ ArtifactRepository localRepository,
List<ArtifactRepository> repositories,
+ String siteDirectory, Locale locale,
String inputEncoding, String outputEncoding )
throws SiteToolException;
/**
@@ -152,7 +155,8 @@ public interface SiteTool
* @param locale the locale used for the i18n in DecorationModel. If null,
using the default locale in the jvm.
* @param categories a map to put on the decoration model, not null.
*/
- void populateReportsMenu( DecorationModel decorationModel, Locale locale,
Map categories );
+ void populateReportsMenu( DecorationModel decorationModel, Locale locale,
+ Map<String, List<MavenReport>> categories );
/**
* Interpolating several expressions in the site descriptor content.
Actually, the expressions can be in
@@ -186,8 +190,9 @@ public interface SiteTool
* @return the site descriptor content based on the <code>site.xml</code>
file with interpolated strings.
* @throws SiteToolException if errors happened during the interpolation.
*/
- String getInterpolatedSiteDescriptorContent( Map props, MavenProject
aProject, String siteDescriptorContent,
- String inputEncoding, String
outputEncoding )
+ String getInterpolatedSiteDescriptorContent( Map<String, String> props,
MavenProject aProject,
+ String siteDescriptorContent,
String inputEncoding,
+ String outputEncoding )
throws SiteToolException;
/**
@@ -203,7 +208,8 @@ public interface SiteTool
* @param localRepository the Maven local repository, not null.
* @return the parent project with interpolated URLs.
*/
- MavenProject getParentProject( MavenProject aProject, List
reactorProjects, ArtifactRepository localRepository );
+ MavenProject getParentProject( MavenProject aProject, List<MavenProject>
reactorProjects,
+ ArtifactRepository localRepository );
/**
* Populate the parent menu part of the decoration model.
@@ -245,7 +251,7 @@ public interface SiteTool
* {...@link #populateModulesMenu(MavenProject, List,
ArtifactRepository, DecorationModel, Locale, boolean)}
* instead
*/
- void populateModules( MavenProject project, List reactorProjects,
ArtifactRepository localRepository,
+ void populateModules( MavenProject project, List<MavenProject>
reactorProjects, ArtifactRepository localRepository,
DecorationModel decorationModel, Locale locale,
boolean keepInheritedRefs )
throws SiteToolException;
@@ -260,8 +266,9 @@ public interface SiteTool
* @param keepInheritedRefs used for inherited references.
* @throws SiteToolException if any
*/
- void populateModulesMenu( MavenProject project, List reactorProjects,
ArtifactRepository localRepository,
- DecorationModel decorationModel, Locale locale,
boolean keepInheritedRefs )
+ void populateModulesMenu( MavenProject project, List<MavenProject>
reactorProjects,
+ ArtifactRepository localRepository,
DecorationModel decorationModel, Locale locale,
+ boolean keepInheritedRefs )
throws SiteToolException;
/**
@@ -273,7 +280,7 @@ public interface SiteTool
* default Locale for this instance of the Java Virtual Machine.
* @return a list of <code>Locale</code>
*/
- List getAvailableLocales( String locales );
+ List<Locale> getAvailableLocales( String locales );
/**
* Converts a locale code like "en", "en_US" or "en_US_win" to a
<code>java.util.Locale</code>
Modified:
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java?rev=957028&r1=957027&r2=957028&view=diff
==============================================================================
---
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
Tue Jun 22 20:55:43 2010
@@ -31,6 +31,7 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.Skin;
import org.apache.maven.doxia.tools.stubs.SiteToolMavenProjectStub;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -233,12 +234,13 @@ public class SiteToolTest
project.setArtifactId( "maven-site" );
project.setVersion( "1.0" );
String siteDirectory = "src/site";
- List reactorProjects = new ArrayList();
+ List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
project.setBasedir( null ); // get it from repo
- DecorationModel model = tool.getDecorationModel( project,
reactorProjects, getLocalRepo(), project
- .getRemoteArtifactRepositories(), siteDirectory,
Locale.getDefault(), "ISO-8859-1", "ISO-8859-1" );
+ DecorationModel model =
+ tool.getDecorationModel( project, reactorProjects, getLocalRepo(),
project.getRemoteArtifactRepositories(),
+ siteDirectory, Locale.getDefault(),
"ISO-8859-1", "ISO-8859-1" );
assertNotNull( model );
assertNotNull( model.getBannerLeft() );
assertEquals( "Maven", model.getBannerLeft().getName() );
@@ -261,7 +263,7 @@ public class SiteToolTest
SiteToolMavenProjectStub project = new SiteToolMavenProjectStub(
"no-site-test" );
String siteDirectory = "src/site";
- List reactorProjects = new ArrayList();
+ List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
DecorationModel model =
tool.getDecorationModel( project, reactorProjects, getLocalRepo(),
project.getRemoteArtifactRepositories(),
Modified:
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java?rev=957028&r1=957027&r2=957028&view=diff
==============================================================================
---
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/stubs/SiteToolMavenProjectStub.java
Tue Jun 22 20:55:43 2010
@@ -76,11 +76,11 @@ public class SiteToolMavenProjectStub
build.setTestSourceDirectory( getBasedir() + "/src/test/java" );
build.setTestOutputDirectory( build.getDirectory() + "/test-classes" );
- 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 );
}
@@ -109,7 +109,7 @@ public class SiteToolMavenProjectStub
}
/** {...@inheritdoc} */
- public List getRemoteArtifactRepositories()
+ public List<ArtifactRepository> getRemoteArtifactRepositories()
{
ArtifactRepository repository = new DefaultArtifactRepository(
"central", "http://repo1.maven.org/maven2";,
new
DefaultRepositoryLayout() );
