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:50:35 UTC
svn commit: r1150423 - in /maven/plugins/trunk/maven-site-plugin/src:
main/java/org/apache/maven/plugins/site/
test/java/org/apache/maven/plugins/site/
Author: dennisl
Date: Sun Jul 24 15:50:34 2011
New Revision: 1150423
URL: http://svn.apache.org/viewvc?rev=1150423&view=rev
Log:
Merge differences in whitespace from 2.x branch.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=1150423&r1=1150422&r2=1150423&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java Sun Jul 24 15:50:34 2011
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import java.io.File;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java?rev=1150423&r1=1150422&r2=1150423&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java Sun Jul 24 15:50:34 2011
@@ -62,7 +62,7 @@ public class SiteDeployMojoTest
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
assertNull( "ProxyInfo must be null because http != scp", proxyInfo );
}
-
+
public void testGetProxyInfoForRepositoryHostExactlyMatchesNonProxyHosts()
{
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password",
Modified: maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java?rev=1150423&r1=1150422&r2=1150423&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java Sun Jul 24 15:50:34 2011
@@ -61,9 +61,8 @@ public class SiteMojoTest
assertTrue( pluginXmlFile.exists() );
SiteMojo siteMojo = (SiteMojo) lookupMojo( "site", pluginXmlFile );
-
assertNotNull( siteMojo );
-
+
File descriptorFile = getTestFile( "src/test/resources/unit/interpolated-site/src/site/site.xml" );
assertNotNull( descriptorFile );
assertTrue( descriptorFile.exists() );