maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1479098 - in /maven/plugins/trunk/maven-site-plugin/src/it: MSITE-537/ MSITE-649/ site-stage-deploy-5/ site-stage-deploy-6/ site-stage-deploy-6/parent/pom.xml site-stage-deploy-6/pom.xml site-stage-deploy-6/verify.bsh
Date Sat, 04 May 2013 13:19:16 GMT
Author: hboutemy
Date: Sat May  4 13:19:15 2013
New Revision: 1479098

URL: http://svn.apache.org/r1479098
Log:
renamed ITs about site:stage-deploy to better match the logic: each IT purpose is described
in main POM name and/or description

Added:
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-5/
      - copied from r1479067, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-649/
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/
      - copied from r1479067, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/
Removed:
    maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/
    maven/plugins/trunk/maven-site-plugin/src/it/MSITE-649/
Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/parent/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/verify.bsh

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/parent/pom.xml?rev=1479098&r1=1479067&r2=1479098&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/parent/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/parent/pom.xml Sat May
 4 13:19:15 2013
@@ -32,7 +32,7 @@ under the License.
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>file://@project.build.directory@/it/MSITE-537/</url>
+      <url>file://@project.build.directory@/it/site-stage-deploy-6/target/site-deployed</url>
     </site>
   </distributionManagement>
 

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/pom.xml?rev=1479098&r1=1479067&r2=1479098&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/pom.xml Sat May  4 13:19:15
2013
@@ -33,5 +33,6 @@ under the License.
   <artifactId>module</artifactId>
   <packaging>pom</packaging>
   <name>MSITE-537</name>
+  <description>site:stage-deploy creates wrong directory structure if run from a sub-module</description>
 
 </project>

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/verify.bsh?rev=1479098&r1=1479067&r2=1479098&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-6/verify.bsh Sat May  4
13:19:15 2013
@@ -25,7 +25,9 @@ boolean result = true;
 
 try
 {
-    final File stageDeployDirectory = new File( basedir, "staging" );
+    final File target = new File( basedir, "target" );
+
+    final File stageDeployDirectory = new File( target, "site-deployed/staging" );
     if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory() )
     {
         System.err.println( "stageDeployDirectory is missing or not a directory." );



Mime
View raw message