Author: ltheussl
Date: Tue Jul 12 11:12:11 2011
New Revision: 1145547
URL: http://svn.apache.org/viewvc?rev=1145547&view=rev
Log:
[MSITE-585] merge r1145546 from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/invoker.properties
- copied unchanged from r1145546,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
Removed:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/goals.txt
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 11:12:11 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,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936
+/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,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=1145547&r1=1145546&r2=1145547&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Jul 12 11:12:11
2011
@@ -602,10 +602,6 @@ under the License.
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
- <!-- FIXME: remove! -->
- <pomExcludes>
- <pomInclude>interpolation/pom.xml</pomInclude>
- </pomExcludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml?rev=1145547&r1=1145546&r2=1145547&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
Tue Jul 12 11:12:11 2011
@@ -31,6 +31,8 @@ under the License.
<properties>
<interpolated>interpolation</interpolated>
+ <site.server>site-deploy</site.server>
+
<site.repository>file://@project.build.directory@/it/${interpolated}/target/site-deployed/parent/</site.repository>
</properties>
<distributionManagement>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml?rev=1145547&r1=1145546&r2=1145547&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
Tue Jul 12 11:12:11 2011
@@ -39,16 +39,6 @@ under the License.
<site.repository>file://@project.build.directory@/it/${interpolated}/target/site-deployed/</site.repository>
</properties>
-<!-- FIXME: moving the distMngmnt section from parent to here makes it work!?
-->
-<!--
- <distributionManagement>
- <site>
- <id>${site.server}</id>
- <url>${site.repository}</url>
- </site>
- </distributionManagement>
--->
-
<build>
<plugins>
<plugin>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh?rev=1145547&r1=1145546&r2=1145547&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
Tue Jul 12 11:12:11 2011
@@ -29,10 +29,11 @@ try
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( "target file is missing or not a directory." );
+ System.err.println( target.getAbsolutePath() );
result = false;
}
- File siteDirectory = new File( target, "site-deployed" );
+ File siteDirectory = new File( target, "site-deployed/interpolation" );
if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
{
System.err.println( "site file is missing or not a directory." );
@@ -44,6 +45,7 @@ try
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "index.html file is missing or a directory." );
+ System.err.println( index.getAbsolutePath() );
result = false;
}
}
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1145547&r1=1145546&r2=1145547&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Tue Jul 12 11:12:11 2011
@@ -756,7 +756,7 @@ public abstract class AbstractDeployMojo
*
* @throws MojoExecutionException if no site info is found in the tree.
*/
- protected static Site getRootSite( MavenProject project )
+ protected Site getRootSite( MavenProject project )
throws MojoExecutionException
{
Site site = getSite( project );
@@ -765,7 +765,8 @@ public abstract class AbstractDeployMojo
while ( parent.getParent() != null )
{
- parent = parent.getParent();
+ // MSITE-585, MNG-1943
+ parent = siteTool.getParentProject( parent, reactorProjects,
localRepository );
try
{
