You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/10/13 00:13:39 UTC
svn commit: r824519 - in /harmony/standard/site/branches/live: ./
docs/documentation/build_website.html xdocs/documentation/build_website.xml
Author: hindessm
Date: Mon Oct 12 22:13:39 2009
New Revision: 824519
URL: http://svn.apache.org/viewvc?rev=824519&view=rev
Log:
Merging from trunk@824517.
Modified:
harmony/standard/site/branches/live/ (props changed)
harmony/standard/site/branches/live/docs/documentation/build_website.html
harmony/standard/site/branches/live/xdocs/documentation/build_website.xml
Propchange: harmony/standard/site/branches/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 12 22:13:39 2009
@@ -1 +1 @@
-/harmony/standard/site/trunk:822221-824514
+/harmony/standard/site/trunk:822221-824518
Modified: harmony/standard/site/branches/live/docs/documentation/build_website.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/build_website.html?rev=824519&r1=824518&r2=824519&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/build_website.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/build_website.html Mon Oct 12 22:13:39 2009
@@ -31,11 +31,8 @@
<meta name="email" content="dev@harmony.apache.org">
-
-
-
-
-
+
+
<title>Apache Harmony - Building and Deploying the Apache Harmony Website</title>
@@ -232,7 +229,7 @@
<ol>
<li>
Download the website source from Harmony subversion repository:</li>
- <pre>$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site</pre>
+ <pre>$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site/trunk site</pre>
<li>
@@ -270,28 +267,32 @@
</h2>
<p>
- If you are a Harmony Committer, you can commit your changes into SVN and then
- publish to the project website. Once the changes are in SVN, do the following:
+ If you are a Harmony Committer, you can commit your changes into
+ SVN. Once committed changes in <code>site/trunk</code> should appear
+ on <a href="http://harmony.staging.apache.org/">the staging site</a>.
+ After reviewing your changes, using the username/password of
+ 'staging'/'staging', you should merge your changes
+ from <code>site/trunk</code> to <code>branches/live</code>. To do that:
</p>
<ol>
<li>
- SSH to <code>minotaur.apache.org</code>. Your login name will of course be your own.</li>
- <pre>$ ssh geirm@minotaur.apache.org </pre>
-
+ Check out the live branch:
+ <pre>$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site/branches/live live-site</pre>
+ </li>
<li>
- Go to the project website directory:</li>
- <pre>$ cd /www/harmony.apache.org/</pre>
-
+ Go to the live-site directory:
+ <pre>$ cd live-site</pre>
+ </li>
<li>
- Update the local copy in one of two ways:
- <pre>$ svn update</pre>
- If you need to delete the HTML and
- re-checkout, use:
- <pre>$ `cat UPDATE`</pre></li>
- <p class="note">Note</p>
- <p class="notetext">The <code>UPDATE</code> file has the command performing a fresh svn checkout.</p>
-
-
+ Merge the changes from <code>site/trunk</code>:
+ <pre>$ svn merge https://svn.apache.org/repos/asf/harmony/standard/site/trunk</pre>
+ </li>
+ <li>
+ Commit the changes to the live branch (using the revision number of
+ the last change on <code>site/trunk</code>):
+ <pre>$ svn ci -m "Merging from trunk@824513"</pre>
+ </li>
+ <li>The changes should appear shortly on the live site.</li>
</ol>
<p class="backtotop"><a href="#top">Back to top</a></p>
Modified: harmony/standard/site/branches/live/xdocs/documentation/build_website.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/documentation/build_website.xml?rev=824519&r1=824518&r2=824519&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/documentation/build_website.xml (original)
+++ harmony/standard/site/branches/live/xdocs/documentation/build_website.xml Mon Oct 12 22:13:39 2009
@@ -59,7 +59,7 @@
<ol>
<li>
Download the website source from Harmony subversion repository:</li>
- <pre>$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site</pre>
+ <pre>$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site/trunk site</pre>
<li>
@@ -98,33 +98,37 @@
<subsection name="Deploying to Harmony Website">
<p>
- If you are a Harmony Committer, you can commit your changes into SVN and then
- publish to the project website. Once the changes are in SVN, do the following:
+ If you are a Harmony Committer, you can commit your changes into
+ SVN. Once committed changes in <code>site/trunk</code> should appear
+ on <a href="http://harmony.staging.apache.org/">the staging site</a>.
+ After reviewing your changes, using the username/password of
+ 'staging'/'staging', you should merge your changes
+ from <code>site/trunk</code> to <code>branches/live</code>. To do that:
</p>
<ol>
<li>
- SSH to <code>minotaur.apache.org</code>. Your login name will of course be your own.</li>
- <pre>$ ssh geirm@minotaur.apache.org </pre>
-
+ Check out the live branch:
+ <pre>$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site/branches/live live-site</pre>
+ </li>
<li>
- Go to the project website directory:</li>
- <pre>$ cd /www/harmony.apache.org/</pre>
-
+ Go to the live-site directory:
+ <pre>$ cd live-site</pre>
+ </li>
<li>
- Update the local copy in one of two ways:
- <pre>$ svn update</pre>
- If you need to delete the HTML and
- re-checkout, use:
- <pre>$ `cat UPDATE`</pre></li>
- <p class="note">Note</p>
- <p class="notetext">The <code>UPDATE</code> file has the command performing a fresh svn checkout.</p>
-
-
+ Merge the changes from <code>site/trunk</code>:
+ <pre>$ svn merge https://svn.apache.org/repos/asf/harmony/standard/site/trunk</pre>
+ </li>
+ <li>
+ Commit the changes to the live branch (using the revision number of
+ the last change on <code>site/trunk</code>):
+ <pre>$ svn ci -m "Merging from trunk@824513"</pre>
+ </li>
+ <li>The changes should appear shortly on the live site.</li>
</ol>
</subsection>
</section>
</body>
-</document>
\ No newline at end of file
+</document>