Apache Harmony - Building and Deploying the Apache Harmony Website

Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 88631 invoked from network); 12 Oct 2009 22:14:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Oct 2009 22:14:02 -0000 Received: (qmail 66194 invoked by uid 500); 12 Oct 2009 22:14:02 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 66155 invoked by uid 500); 12 Oct 2009 22:14:02 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 66146 invoked by uid 99); 12 Oct 2009 22:14:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Oct 2009 22:14:02 +0000 X-ASF-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Oct 2009 22:13:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C10C1238889D; Mon, 12 Oct 2009 22:13:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r824519 - in /harmony/standard/site/branches/live: ./ docs/documentation/build_website.html xdocs/documentation/build_website.xml Date: Mon, 12 Oct 2009 22:13:39 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091012221339.C10C1238889D@eris.apache.org> 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 @@ - - - - - + + Apache Harmony - Building and Deploying the Apache Harmony Website @@ -232,7 +229,7 @@

Download the website source from Harmony subversion repository:

$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site

$ svn checkout https://svn.apache.org/repos/asf/harmony/standard/site/trunk site

@@ -270,28 +267,32 @@
- 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 site/trunk should appear + on the staging site. + After reviewing your changes, using the username/password of + 'staging'/'staging', you should merge your changes + from site/trunk to branches/live. To do that:
1. - SSH to minotaur.apache.org. Your login name will of course be your own.
2. - Go to the project website directory:
3. - Update the local copy in one of two ways: -
```
$ svn update
```
  - If you need to delete the HTML and - re-checkout, use: -
```
$ `cat UPDATE`
```
4. + Commit the changes to the live branch (using the revision number of + the last change on site/trunk): +
```
$ svn ci -m "Merging from trunk@824513"
```
  +
5. The changes should appear shortly on the live site.
Back to top
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 @@
1. Download the website source from Harmony subversion repository:
2. @@ -98,33 +98,37 @@
  - 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 site/trunk should appear + on the staging site. + After reviewing your changes, using the username/password of + 'staging'/'staging', you should merge your changes + from site/trunk to branches/live. To do that:
  1. - SSH to minotaur.apache.org. Your login name will of course be your own.
  2. - Go to the project website directory:
  3. - Update the local copy in one of two ways: -
```
$ svn update
```
    - If you need to delete the HTML and - re-checkout, use: -
```
$ `cat UPDATE`
```
  4. + Commit the changes to the live branch (using the revision number of + the last change on site/trunk): +
```
$ svn ci -m "Merging from trunk@824513"
```
    +
  5. The changes should appear shortly on the live site.
  - \ No newline at end of file +