You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/03/15 19:15:56 UTC
svn commit: r1081887 - in
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site:
AbstractSiteMojo.java AbstractSiteRenderingMojo.java
SiteDescriptorAttachMojo.java
Author: ltheussl
Date: Tue Mar 15 18:15:56 2011
New Revision: 1081887
URL: http://svn.apache.org/viewvc?rev=1081887&view=rev
Log:
remove toRelative and use the siteTool method instead, this does some URL manipulation, let's see if that helps
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1081887&r1=1081886&r2=1081887&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Tue Mar 15 18:15:56 2011
@@ -130,32 +130,6 @@ public abstract class AbstractSiteMojo
}
/**
- * TODO should be removed see PLXUTILS-61
- *
- * @param basedir
- * @param absolutePath
- * @return
- */
- protected static String toRelative( File basedir, String absolutePath )
- {
- String relative;
-
- absolutePath = absolutePath.replace( '\\', '/' );
- String basedirPath = basedir.getAbsolutePath().replace( '\\', '/' );
-
- if ( absolutePath.startsWith( basedirPath ) )
- {
- relative = absolutePath.substring( basedirPath.length() + 1 );
- }
- else
- {
- relative = absolutePath;
- }
-
- return relative;
- }
-
- /**
* Check the current Maven version and emit a warning if it's Maven 3.
* This plugin does not work with Maven 3.x.
*/
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1081887&r1=1081886&r2=1081887&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Tue Mar 15 18:15:56 2011
@@ -211,8 +211,8 @@ public abstract class AbstractSiteRender
try
{
decorationModel = siteTool.getDecorationModel( project, reactorProjects, localRepository, repositories,
- toRelative( project.getBasedir(),
- siteDirectory.getAbsolutePath() ),
+ siteTool.getRelativePath( siteDirectory.getAbsolutePath(),
+ project.getBasedir().getAbsolutePath() ),
locale, getInputEncoding(), getOutputEncoding() );
}
catch ( SiteToolException e )
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=1081887&r1=1081886&r2=1081887&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Tue Mar 15 18:15:56 2011
@@ -73,8 +73,8 @@ public class SiteDescriptorAttachMojo
for ( Locale locale : localesList )
{
- File descriptorFile = siteTool.getSiteDescriptorFromBasedir( toRelative( project.getBasedir(),
- siteDirectory.getAbsolutePath() ),
+ File descriptorFile = siteTool.getSiteDescriptorFromBasedir(
+ siteTool.getRelativePath( siteDirectory.getAbsolutePath(), project.getBasedir().getAbsolutePath() ),
basedir, locale );
if ( descriptorFile.exists() )