You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/07/24 17:49:11 UTC
svn commit: r1150420 - in /maven/plugins/branches/maven-site-plugin-2.x/src:
it/site-attach-descriptor/ main/java/org/apache/maven/plugins/site/
Author: dennisl
Date: Sun Jul 24 15:49:10 2011
New Revision: 1150420
URL: http://svn.apache.org/viewvc?rev=1150420&view=rev
Log:
Merge differences in whitespace from trunk.
Modified:
maven/plugins/branches/maven-site-plugin-2.x/src/it/site-attach-descriptor/verify.bsh
maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
Modified: maven/plugins/branches/maven-site-plugin-2.x/src/it/site-attach-descriptor/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/site-attach-descriptor/verify.bsh?rev=1150420&r1=1150419&r2=1150420&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/it/site-attach-descriptor/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/it/site-attach-descriptor/verify.bsh Sun Jul 24 15:49:10 2011
@@ -52,9 +52,8 @@ try
System.err.println( "siteDescriptorSwedish file is missing from target or is a directory." );
return false;
}
-
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1150420&r1=1150419&r2=1150420&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Sun Jul 24 15:49:10 2011
@@ -345,7 +345,7 @@ public abstract class AbstractDeployMojo
{
AuthenticationInfo authenticationInfo = manager.getAuthenticationInfo( repository.getId() );
log.debug( "authenticationInfo with id '" + repository.getId() + "': "
- + ( ( authenticationInfo == null ) ? "-" : authenticationInfo.getUserName() ) );
+ + ( ( authenticationInfo == null ) ? "-" : authenticationInfo.getUserName() ) );
try
{
Modified: maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1150420&r1=1150419&r2=1150420&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Sun Jul 24 15:49:10 2011
@@ -456,7 +456,6 @@ public abstract class AbstractSiteRender
if ( report != null )
{
-
if ( item.getName() == null )
{
item.setName( report.getName( locale ) );
Modified: maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=1150420&r1=1150419&r2=1150420&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java (original)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java Sun Jul 24 15:49:10 2011
@@ -107,7 +107,7 @@ public class ReportDocumentRenderer
return null;
}
-
+
private static class MySink
extends SiteRendererSink
{
@@ -187,7 +187,7 @@ public class ReportDocumentRenderer
String localReportName = report.getName( locale );
log.info( "Generating \"" + localReportName + "\" report"
- + ( pluginInfo == null ? "." : ( " --- " + pluginInfo ) ) );
+ + ( pluginInfo == null ? "." : ( " --- " + pluginInfo ) ) );
MySinkFactory sf = new MySinkFactory( renderingContext );