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/05 22:30:04 UTC
svn commit: r1078361 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
src/site/fml/faq.fml
Author: ltheussl
Date: Sat Mar 5 21:30:04 2011
New Revision: 1078361
URL: http://svn.apache.org/viewvc?rev=1078361&view=rev
Log:
merge r1051139 and r1051449 from trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/site/fml/faq.fml
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 5 21:30:04 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=1078361&r1=1078360&r2=1078361&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java Sat Mar 5 21:30:04 2011
@@ -67,6 +67,11 @@ public class SiteStageDeployMojo
* "${project.distributionManagement.site.url}/staging", where "project" is
* either the current project or, in a reactor build, the top level project
* in the reactor.
+ * <p>
+ * Note that even if you specify this plugin parameter you still need to indicate
+ * ${project.distributionManagement.site.url} at least in your top level project
+ * in order for relative links between modules to be resolved correctly.
+ * </p>
*
* @parameter expression="${stagingSiteURL}"
* @see <a href="http://maven.apache.org/maven-model/maven.html#class_site">MavenModel#class_site</a>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/fml/faq.fml?rev=1078361&r1=1078360&r2=1078361&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/fml/faq.fml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/fml/faq.fml Sat Mar 5 21:30:04 2011
@@ -116,6 +116,7 @@ under the License.
In a multi module build it is important for the parent and child
modules to have <strong>different</strong> URLs. If they have the
same URL, then links within the combined site will not work.
+ Note that a proper URL <strong>should</strong> also be terminated by a slash ("/").
</p>
</answer>
</faq>