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/03/11 17:26:05 UTC
svn commit: r1080637 - in /maven/plugins/trunk/maven-site-plugin: ./
src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
Author: dennisl
Date: Fri Mar 11 16:26:04 2011
New Revision: 1080637
URL: http://svn.apache.org/viewvc?rev=1080637&view=rev
Log:
o Merge r992626 from maven-site-plugin-3.x branch
Modified:
maven/plugins/trunk/maven-site-plugin/ (props changed)
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
Propchange: maven/plugins/trunk/maven-site-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 16:26:04 2011
@@ -1 +1 @@
-/maven/plugins/branches/maven-site-plugin-3.x:940318,942876,956257,1003823
+/maven/plugins/branches/maven-site-plugin-3.x:940318,942876,956257,992626,1003823
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java?rev=1080637&r1=1080636&r2=1080637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java Fri Mar 11 16:26:04 2011
@@ -151,7 +151,7 @@ public class SiteRunMojo
webapp.setContextPath( "/" );
webapp.setResourceBase( tempWebappDirectory.getAbsolutePath() );
webapp.setAttribute( DoxiaFilter.SITE_RENDERER_KEY, siteRenderer );
- webapp.getInitParams().put( "org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false" );
+ webapp.getInitParams().put( "org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false" );
// For external reports
project.getReporting().setOutputDirectory( tempWebappDirectory.getAbsolutePath() );
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java?rev=1080637&r1=1080636&r2=1080637&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java Fri Mar 11 16:26:04 2011
@@ -373,7 +373,8 @@ public final class PathUtils
else
{
int index = url.indexOf( "://" );
- if( index != -1 ) {
+ if ( index != -1 )
+ {
pos = index + 3;
}
}