Author: felixk
Date: Tue Oct 18 11:19:49 2011
New Revision: 1185578
URL: http://svn.apache.org/viewvc?rev=1185578&view=rev
Log:
Don't overwrite website with reports accidently (JAMES-1338)
Modified:
james/project/trunk/HOWTO.txt
james/project/trunk/pom.xml
Modified: james/project/trunk/HOWTO.txt
URL:
http://svn.apache.org/viewvc/james/project/trunk/HOWTO.txt?rev=1185578&r1=1185577&r2=1185578&view=diff
==============================================================================
--- james/project/trunk/HOWTO.txt (original)
+++ james/project/trunk/HOWTO.txt Tue Oct 18 11:19:49 2011
@@ -3,6 +3,8 @@ How to build and publish the website:
1. Install Apache Maven 3.0.2+ and make its binary 'mvn' available on your
PATH.
2. run "mvn clean site"
3. Test the built site in your browser from the {path}/target/site folder
- 4. If everything looks OK, deploy the site using "mvn clean deploy-site".
+ 4. If everything looks OK, deploy the site using "mvn clean site-deploy".
5. Wait for the changes to replicate to the Apache web server or setup
140.211.11.10:80 as
a proxy to review the changes (described here:
http://www.apache.org/dev/project-site.html)
+
+To deploy the technical reports use the "-Psite-reports" profile.
\ No newline at end of file
Modified: james/project/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/pom.xml?rev=1185578&r1=1185577&r2=1185578&view=diff
==============================================================================
--- james/project/trunk/pom.xml (original)
+++ james/project/trunk/pom.xml Tue Oct 18 11:19:49 2011
@@ -301,10 +301,13 @@
</ciManagement>
<distributionManagement>
- <!-- Each project must override this with their own -->
<site>
<id>james-website</id>
- <url>scp://people.apache.org/www/james.apache.org/</url>
+ <!--
+ Use properties to build deploy url to avoid accidently
overriding the common module's
+ website when using "-Psite-reports" by chance
+ -->
+
<url>scp://people.apache.org/www/james.apache.org/${deploySiteDirectory}/${deployTechnicalSiteDirectory}</url>
</site>
</distributionManagement>
@@ -313,6 +316,17 @@
<target.jdk>1.5</target.jdk>
<maven-site-plugin.siteDirectory>${basedir}/src/site</maven-site-plugin.siteDirectory>
<maven-site-plugin.generateReports>false</maven-site-plugin.generateReports>
+ <!--
+ NOTE:
+ Each project must override this property with their own value.
+ This property contains the directory where to deploy when running
"site" without profile
+ -->
+ <deploySiteDirectory></deploySiteDirectory>
+ <!--
+ This property contains the directory where to deploy when running
using "-Psite-reports" profile
+ to avoid accidently overriding the common modules website. Empty
by default.
+ -->
+ <deployTechnicalSiteDirectory></deployTechnicalSiteDirectory>
</properties>
<repositories>
@@ -482,6 +496,11 @@
<!-- Overriding values set by default (see properties section)
-->
<maven-site-plugin.siteDirectory>${basedir}/src/reporting-site</maven-site-plugin.siteDirectory>
<maven-site-plugin.generateReports>true</maven-site-plugin.generateReports>
+ <!--
+ This property contains the directory where to deploy when
running using "-Psite-reports" profile
+ to avoid accidently overriding the common modules website
+ -->
+
<deployTechnicalSiteDirectory>technical-reports</deployTechnicalSiteDirectory>
</properties>
</profile>
</profiles>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
