creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1411835 - in /creadur/rat/trunk: pom.xml src/site/apt/site-publish.apt
Date Tue, 20 Nov 2012 20:13:31 GMT
Author: rdonkin
Date: Tue Nov 20 20:13:30 2012
New Revision: 1411835

URL: http://svn.apache.org/viewvc?rev=1411835&view=rev
Log:
The publication magic only works when the output of mvn site:deploy is set to the input of
scmpublish

Modified:
    creadur/rat/trunk/pom.xml
    creadur/rat/trunk/src/site/apt/site-publish.apt

Modified: creadur/rat/trunk/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/pom.xml?rev=1411835&r1=1411834&r2=1411835&view=diff
==============================================================================
--- creadur/rat/trunk/pom.xml (original)
+++ creadur/rat/trunk/pom.xml Tue Nov 20 20:13:30 2012
@@ -52,28 +52,24 @@ agnostic home for software distribution 
     <mavenVersion>2.2.1</mavenVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!--
-      These properties are to allow deployment to another target than
-      the Apache repositories. The default settings are expected to
-      match the settings from the parent POM.
-
-      To override these properties, use something like the following
-      in your settings.xml:
-        <profiles>
-          <profile>
-            <activation>
-              <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-              <rat.site.url>file:///C:/temp/my.rat.site</rat.site.url>
-              ...
-            </properties>
-          </profile>
-        </profiles>
-    -->
-    <!--
-    For the moment, deploy to stage directory only.
+    Publication to the website is a two phase operation:
+
+     1. Deploy to local stage: mvn site:deploy
+     2. Publish to Apache CMS: mvn scm-publish:publish-scm
+
+    This will only work when the origin for scm-publish:publish-scm
+    is the target for site:deploy.
+
+    SO MAKE SURE THAT THE FOLLOWING PROPERTIES RESOLVE TO THE SAME
+    DIRECTORY:
+
+     * scmpublish.content
+     * rat.site.url
+
     -->
-    <rat.site.url>file:stage</rat.site.url>
+    <rat.LocalSiteStaging>stage</rat.LocalSiteStaging>
+    <scmpublish.content>${rat.LocalSiteStaging}</scmpublish.content>
+    <rat.site.url>file:${rat.LocalSiteStaging}</rat.site.url>
     <rat.site.name>Apache Rat Website</rat.site.name>
     <rat.site.id>org.apache.rat.site</rat.site.id>
     <rat.releases.id>apache.releases.https</rat.releases.id>
@@ -83,8 +79,6 @@ agnostic home for software distribution 
     <rat.snapshots.name>${distMgmtSnapshotsName}</rat.snapshots.name> <!--
Parent POM uses these properties -->
     <rat.snapshots.url>${distMgmtSnapshotsUrl}</rat.snapshots.url>
 
-    <scmpublish.content>stage</scmpublish.content>
-
     <!-- maven plugin versions -->
     <surefire.version>2.12.3</surefire.version>
   </properties>

Modified: creadur/rat/trunk/src/site/apt/site-publish.apt
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/src/site/apt/site-publish.apt?rev=1411835&r1=1411834&r2=1411835&view=diff
==============================================================================
--- creadur/rat/trunk/src/site/apt/site-publish.apt (original)
+++ creadur/rat/trunk/src/site/apt/site-publish.apt Tue Nov 20 20:13:30 2012
@@ -62,6 +62,15 @@ mvn clean install site
  Publishing updates the main site with changes committed since the last
  time the site was published.
 
+** Publish to Local Stage
+
+ Rat declares a local staging directory (<<<stage>>>) for Maven
+ site deployments. To avoid excessive numbers of commits, the
+ local staging directory needs to remain ignored by <<<subversion>>>.
+ As well as being the target for <<<mvn site:deploy>>>, this is also
+ the origin for publication.
+
+
 
 Troubleshooting
 



Mime
View raw message