svn commit: r1291070 - in /maven/site/branches/INFRA-4466: content/ pom.xml src/site/

[hb...@apache.org]

Author: hboutemy
Date: Sun Feb 19 22:12:25 2012
New Revision: 1291070

URL: http://svn.apache.org/viewvc?rev=1291070&view=rev
Log:
[INFRA-4466] moved src/site to content and added site.output property with output default value

Added:
    maven/site/branches/INFRA-4466/content/
      - copied from r1291067, maven/site/branches/INFRA-4466/src/site/
Removed:
    maven/site/branches/INFRA-4466/src/site/
Modified:
    maven/site/branches/INFRA-4466/pom.xml

Modified: maven/site/branches/INFRA-4466/pom.xml
URL: http://svn.apache.org/viewvc/maven/site/branches/INFRA-4466/pom.xml?rev=1291070&r1=1291069&r2=1291070&view=diff
==============================================================================
--- maven/site/branches/INFRA-4466/pom.xml (original)
+++ maven/site/branches/INFRA-4466/pom.xml Sun Feb 19 22:12:25 2012
@@ -27,11 +27,11 @@
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
-  <artifactId>maven-site</artifactId>
+  <artifactId>maven-site-INFRA-4466</artifactId>
   <version>1.0</version>
   <packaging>pom</packaging>
 
-  <name>Apache Maven Site</name>
+  <name>Apache Maven Site for INFRA-4466: CMS/svnpubsub tests</name>
   <url>http://maven.apache.org/</url>
 
   <mailingLists>
@@ -140,6 +140,7 @@
     <versions2x>2.2.1,2.2.0,2.1.0,2.0.11,2.0.10,2.0.9,2.0.8,2.0.7,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,2.0</versions2x>
     <versions3x>3.0.4,3.0.3,3.0.2,3.0.1,3.0,3.0-beta-3,3.0-beta-2,3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3</versions3x>
     <site.deploy.url>scp://people.apache.org/www/maven.apache.org/</site.deploy.url>
+    <site.output>${basedir}/output</site.output>
   </properties>
 
   <repositories>
@@ -180,7 +181,7 @@
                   <message>Generated site should have inherited the correct skin from the parent</message>
                   <!-- check assumes you've run with "clean" -->
                   <files>
-                    <file>${project.build.directory}/site/images/apache-maven-project-2.png</file>
+                    <file>${project.reporting.outputDirectory}/images/apache-maven-project-2.png</file>
                   </files>
                 </requireFilesExist>
               </rules>
@@ -200,10 +201,10 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/site</outputDirectory>
+              <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
               <resources>
                 <resource>
-                  <directory>src/site/filtered-resources</directory>
+                  <directory>${basedir}/content/filtered-resources</directory>
                   <filtering>true</filtering>
                 </resource>
               </resources>
@@ -215,6 +216,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <siteDirectory>${basedir}/content</siteDirectory>
+        </configuration>
         <executions>
           <execution>
             <id>jar</id>
@@ -233,6 +237,7 @@
 
   <reporting>
     <excludeDefaults>true</excludeDefaults>
+    <outputDirectory>${site.output}</outputDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>