Author: hboutemy
Date: Thu Mar 31 22:15:17 2011
New Revision: 1087459
URL: http://svn.apache.org/viewvc?rev=1087459&view=rev
Log:
updated code to generics from doxia-decoration-model (merged from trunk
r1087455)
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 31 22:15:17 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1087459&r1=1087458&r2=1087459&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Thu Mar 31 22:15:17 2011
@@ -746,7 +746,7 @@ public abstract class AbstractDeployMojo
/**
* Extract the distributionManagment site of the top level parent of the
given MavenProject.
- * This climbs up the project hirarchy and returns the site of the last
project
+ * This climbs up the project hierarchy and returns the site of the last
project
* for which {@link #getSite(org.apache.maven.project.MavenProject)}
returns a site.
*
* @param project the MavenProject. Not null.
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1087459&r1=1087458&r2=1087459&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Thu Mar 31 22:15:17 2011
@@ -132,7 +132,7 @@ public abstract class AbstractSiteRender
*
* @parameter expression="${attributes}"
*/
- private Map<Object, Object> attributes;
+ private Map<String, Object> attributes;
/**
* Site renderer.
@@ -254,7 +254,7 @@ public abstract class AbstractSiteRender
{
if ( attributes == null )
{
- attributes = new HashMap<Object, Object>();
+ attributes = new HashMap<String, Object>();
}
if ( attributes.get( "project" ) == null )
@@ -273,7 +273,10 @@ public abstract class AbstractSiteRender
}
// Put any of the properties in directly into the Velocity context
- attributes.putAll( project.getProperties() );
+ for ( Map.Entry<Object, Object> entry :
project.getProperties().entrySet() )
+ {
+ attributes.put( (String) entry.getKey(), entry.getValue() );
+ }
DecorationModel decorationModel;
try
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java?rev=1087459&r1=1087458&r2=1087459&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
Thu Mar 31 22:15:17 2011
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.site;
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -144,10 +143,8 @@ public class SiteMap
sink.text( i18n.getString( "site-plugin", locale,
"site.sitemap.description" ) );
sink.paragraph_();
- for ( Iterator<Menu> it = decoration.getMenus().iterator();
it.hasNext(); )
+ for ( Menu menu : decoration.getMenus() )
{
- Menu menu = it.next();
-
sink.section3();
sink.sectionTitle3();
sink.text( menu.getName() );
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java?rev=1087459&r1=1087458&r2=1087459&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
Thu Mar 31 22:15:17 2011
@@ -410,7 +410,7 @@ public final class PathUtils
/**
* Decodes the specified (portion of a) URL. <strong>Note:</strong> This
decoder assumes that ISO-8859-1 is used to
- * convert URL-encoded octets to characters.
+ * convert URL-encoded bytes to characters.
*
* @param url The URL to decode, may be <code>null</code>.
* @return The decoded URL or <code>null</code> if the input was
<code>null</code>.
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java?rev=1087459&r1=1087458&r2=1087459&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Thu Mar 31 22:15:17 2011
@@ -73,8 +73,9 @@ public class SiteMojoTest
assertTrue( siteDescriptorContent.indexOf( "${project.name}" ) != -1 );
SiteTool siteTool = (SiteTool) lookup( SiteTool.ROLE );
- siteDescriptorContent = siteTool.getInterpolatedSiteDescriptorContent(
new HashMap(), siteMojo.project,
-
siteDescriptorContent, "UTF-8", "UTF-8" );
+ siteDescriptorContent =
+ siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String,
String>(), siteMojo.project,
+
siteDescriptorContent, "UTF-8", "UTF-8" );
assertNotNull( siteDescriptorContent );
assertTrue( siteDescriptorContent.indexOf( "${project.name}" ) == -1 );
}
