You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/02/12 01:25:16 UTC
svn commit: r620678 - in
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site:
AbstractSiteMojo.java AbstractSiteRenderingMojo.java
SiteDescriptorAttachMojo.java
Author: vsiveton
Date: Mon Feb 11 16:25:10 2008
New Revision: 620678
URL: http://svn.apache.org/viewvc?rev=620678&view=rev
Log:
MSITE-279: Inheritance of elements from site descriptor quite broken
o updated code due to r620676
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=620678&r1=620677&r2=620678&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 Mon Feb 11 16:25:10 2008
@@ -285,4 +285,30 @@
populateItemRefs( item.getItems(), locale, reportsByOutputName );
}
}
+
+ /**
+ * 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;
+ }
}
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=620678&r1=620677&r2=620678&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 Mon Feb 11 16:25:10 2008
@@ -223,7 +223,7 @@
DecorationModel decorationModel;
try
{
- decorationModel = siteTool.getDecorationModel( project, reactorProjects, localRepository, repositories, siteDirectory, locale, inputEncoding, outputEncoding );
+ decorationModel = siteTool.getDecorationModel( project, reactorProjects, localRepository, repositories, toRelative( project.getBasedir(), siteDirectory.getAbsolutePath() ), locale, inputEncoding, outputEncoding );
}
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=620678&r1=620677&r2=620678&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 Mon Feb 11 16:25:10 2008
@@ -71,7 +71,7 @@
{
Locale locale = (Locale) iterator.next();
- File descriptorFile = siteTool.getSiteDescriptorFromBasedir( siteDirectory, basedir, locale );
+ File descriptorFile = siteTool.getSiteDescriptorFromBasedir( toRelative( project.getBasedir(), siteDirectory.getAbsolutePath() ), basedir, locale );
if ( descriptorFile.exists() )
{