aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r784626 [1/3] - in /websites/production/aries: ./ content/ content/development/ content/downloads/ content/downloads/archived-releases/0.1-incubating/ content/downloads/archived-releases/0.1/ content/downloads/archived-releases/0.2-incubati...
Date Wed, 02 Feb 2011 09:44:28 GMT
Author: zoe
Date: Wed Feb  2 09:44:27 2011
New Revision: 784626

Log:
Changes to release pages to pick up 0.3 release

Added:
    websites/production/aries/content/downloads/archived-releases/0.1/
      - copied from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1/
    websites/production/aries/content/downloads/archived-releases/0.1-incubating/
      - copied from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1-incubating/
    websites/production/aries/content/downloads/archived-releases/0.1-incubating/0.1-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1-incubating/0.1-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.1-incubating/BlogSample.png
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1-incubating/BlogSample.png
    websites/production/aries/content/downloads/archived-releases/0.1-incubating/ariesTraderOverview2.png
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1-incubating/ariesTraderOverview2.png
    websites/production/aries/content/downloads/archived-releases/0.1-incubating/ariestrader-0.1-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1-incubating/ariestrader-0.1-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.1-incubating/blogsample-0.1-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1-incubating/blogsample-0.1-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.1/0.1-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1/0.1-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.1/BlogSample.png
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1/BlogSample.png
    websites/production/aries/content/downloads/archived-releases/0.1/ariesTraderOverview2.png
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1/ariesTraderOverview2.png
    websites/production/aries/content/downloads/archived-releases/0.1/ariestrader-0.1-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1/ariestrader-0.1-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.1/blogsample-0.1-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.1/blogsample-0.1-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.2-incubating/
      - copied from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.2-incubating/
    websites/production/aries/content/downloads/archived-releases/0.2-incubating/0.2-incubating-releasenotes.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.2-incubating/0.2-incubating-releasenotes.html
    websites/production/aries/content/downloads/archived-releases/0.2-incubating/0.2-incubating-testresults.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.2-incubating/0.2-incubating-testresults.html
    websites/production/aries/content/downloads/archived-releases/0.2-incubating/0.2-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.2-incubating/0.2-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.2-incubating/ariestrader-0.2-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.2-incubating/ariestrader-0.2-incubating.html
    websites/production/aries/content/downloads/archived-releases/0.2-incubating/blogsample-0.2-incubating.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/archived-releases/0.2-incubating/blogsample-0.2-incubating.html
    websites/production/aries/content/downloads/ct/0.2-incubating/
      - copied from r784625, websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/
    websites/production/aries/content/downloads/ct/0.2-incubating/org.osgi.test.cases.blueprint.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/org.osgi.test.cases.blueprint.html
    websites/production/aries/content/downloads/ct/0.2-incubating/org.osgi.test.cases.blueprint.java5.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/org.osgi.test.cases.blueprint.java5.html
    websites/production/aries/content/downloads/ct/0.2-incubating/org.osgi.test.cases.blueprint.secure.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/org.osgi.test.cases.blueprint.secure.html
    websites/production/aries/content/downloads/ct/0.2-incubating/org.osgi.test.cases.jmx.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/org.osgi.test.cases.jmx.html
    websites/production/aries/content/downloads/ct/0.2-incubating/org.osgi.test.cases.jndi.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/org.osgi.test.cases.jndi.html
    websites/production/aries/content/downloads/ct/0.2-incubating/org.osgi.test.cases.transaction.html
      - copied unchanged from r784625, websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/org.osgi.test.cases.transaction.html
Modified:
    websites/production/aries/   (props changed)
    websites/production/aries/content/development/maintainingthewebpages.html
    websites/production/aries/content/development/releasingaries.html
    websites/production/aries/content/downloads/archived-releases.html
    websites/production/aries/content/downloads/blogsample-0.2-incubating.html
    websites/production/aries/content/downloads/currentrelease.html
    websites/production/aries/content/index.html
    websites/production/aries/content/modules/samples/ariestrader.html

Propchange: websites/production/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  2 09:44:27 2011
@@ -1 +1 @@
-/websites/staging/aries/trunk:782169-784049
+/websites/staging/aries/trunk:782169-784625

Modified: websites/production/aries/content/development/maintainingthewebpages.html
==============================================================================
--- websites/production/aries/content/development/maintainingthewebpages.html (original)
+++ websites/production/aries/content/development/maintainingthewebpages.html Wed Feb  2 09:44:27
2011
@@ -251,7 +251,46 @@ ID and password are the same ones as you
 <p>The Wiki syntax is called Markdown and is documented <a href="http://www.freewisdom.org/projects/python-markdown/">here</a>.
Some extensions are installed in 
 the CMS system (eg tables, syntax highlighting). </p>
 <p>More information on CMS is 
-available <a href="http://wiki.apache.org/general/ApacheCms2010">here</a></p></div>
+available <a href="http://wiki.apache.org/general/ApacheCms2010">here</a></p>
+<h1 id="making_major_changes">Making major changes</h1>
+<p>Because the site is all in SVN its possible to check it out, make and test changes
locally and then check in again much as you woudl with code changes.
+To do this you will need:</p>
+<ul>
+<li>A local copy of the cms build tools</li>
+<li>A local setup of Apache</li>
+</ul>
+<p>First, checkout the site , like this:</p>
+<div class="codehilite"><pre><span class="n">svn</span> <span
class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span
class="n">asf</span><span class="sr">/aries/si</span><span class="n">te</span><span
class="sr">/trunk/</span> <span class="n">site</span>
+</pre></div>
+
+
+<h2 id="to_build_the_site_using_the_build_tools">To build the site using the build
tools.</h2>
+<p>First check the cms build tools out of SVN: </p>
+<div class="codehilite"><pre><span class="n">svn</span> <span
class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="sr">/repos/i</span><span
class="n">nfra</span><span class="sr">/websites/cms/build/</span> <span
class="n">buildtools</span>
+</pre></div>
+
+
+<p>To run the build_site.pl script you will need to install the Python version 
+of Markup. The instructions for finding and installing Python pre-reqs are given [here] (http://wiki.apache.org/general/ApacheCMSFAQ)</p>
+<p>Then to build the site use this command:</p>
+<p>perl build_site.pl --source-base /path/to/newsite/trunk/ --target-base /path/to/output/</p>
+<p>which will create *.html in /path/to/output/content</p>
+<h2 id="check_the_site_on_a_local_server">Check the site on a local server.</h2>
+<p>Use a vhost to check the site. On a Mac this means adding the following stanza to
/etc/apache2/extra/httpd-vhosts.conf</p>
+<p><VirtualHost *:80>
+    DocumentRoot "/Users/zoe/Sites/zaries/www"
+    ServerName zaries
+    ErrorLog "/Users/zoe/Sites/zaries/error.log"
+    CustomLog "/Users/zoe/Sites/zaries/access.log" custom</p>
+<div class="codehilite"><pre><span class="n">LogLevel</span> <span
class="n">debug</span>
+</pre></div>
+
+
+</VirtualHost>
+
+<p>To test the site,  move it like this:</p>
+<p>mv /path/to/output/content /Users/zoe/Sites/zaries/www</p>
+<p>Then navigate to http://zaries in a browser.</p></div>
             <!-- Content -->
           </td>
         </tr>

Modified: websites/production/aries/content/development/releasingaries.html
==============================================================================
--- websites/production/aries/content/development/releasingaries.html (original)
+++ websites/production/aries/content/development/releasingaries.html Wed Feb  2 09:44:27
2011
@@ -533,8 +533,7 @@ module this works on *ix:</p>
 
 
 <p>Next - delete the tag relating to the module from SVN</p>
-<p>Finally - delete the folder from the staging repository (this seems to take
-several attempts and a very long time to achieve)</p>
+<p>Finally - delete the folder from the staging repository (Right-click over the folder
and select delete)</p>
 <p>Make the fixes that you need to in the project, commit them and work
 through the release process again. </p>
 <p>In some cases you may also want to merge from trunk into the release

Modified: websites/production/aries/content/downloads/archived-releases.html
==============================================================================
--- websites/production/aries/content/downloads/archived-releases.html (original)
+++ websites/production/aries/content/downloads/archived-releases.html Wed Feb  2 09:44:27
2011
@@ -237,7 +237,8 @@
             <div class="wiki-content"><p><a name="ArchivedReleases-Archivedreleases"></a></p>
 <h1 id="archived_releases">Archived releases</h1>
 <ul>
-<li><a href="archived-releases/0.1-incubating.html">0.1-incubating release</a></li>
+<li><a href="archived-releases/0.1-incubating/0.1-incubating.html">0.1-incubating
release</a></li>
+<li><a href="archived-releases/0.2-incubating/0.2-incubating.html">0.2-incubating
release</a></li>
 </ul></div>
             <!-- Content -->
           </td>

Modified: websites/production/aries/content/downloads/blogsample-0.2-incubating.html
==============================================================================
--- websites/production/aries/content/downloads/blogsample-0.2-incubating.html (original)
+++ websites/production/aries/content/downloads/blogsample-0.2-incubating.html Wed Feb  2
09:44:27 2011
@@ -243,8 +243,7 @@
 <hr />
 <p><strong>Note:</strong>
 These instructions are for the 0.2-incubating release of Aries.
-Instructions for older releases can be found <a href="archived-releases/blogsample-0.1-incubating.html">here</a>
-. In the 0.2-incubating release the sample was changed to use an in-memory
+In the 0.2-incubating release the sample was changed to use an in-memory
 database to avoid dependency on an explicit version of Derby. If you would
 prefer to use a database on disk check the instructions for the
 0.1-incubating release. You will also need to modify datasource.xml (under
@@ -254,7 +253,7 @@ blog-datasource) as indicated in the com
 <h3 id="create_the_osgi_platform_for_the_blog_sample">Create the OSGi platform for
the Blog sample</h3>
 <p>Download and unzip the source zip for the <a href="aries:downloads.html">latest
release</a>
  of Aries Samples and build the blog-assembly module:</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span
class="o">-</span><span class="mi">0</span><span class="o">.</span><span
class="mi">2</span><span class="o">-</span><span class="n">incubating</span><span
class="sr">/blog/</span><span class="n">blog</span><span class="o">-</span><span
class="n">assembly</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span
class="o">-</span><span class="mf">0.2</span><span class="o">-</span><span
class="n">incubating</span><span class="sr">/blog/</span><span class="n">blog</span><span
class="o">-</span><span class="n">assembly</span>
 <span class="n">mvn</span> <span class="n">install</span>
 </pre></div>
 
@@ -265,13 +264,13 @@ dependencies.</p>
 <h3 id="running_the_blog_sample_1">Running the Blog sample</h3>
 <p>Download the JDBC based Blog sample application (.eba file) from the <a href="aries:downloads.html">latest
release</a>
 . Change directory to the blog-assembly target directory:</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span
class="o">-</span><span class="mi">0</span><span class="o">.</span><span
class="mi">2</span><span class="o">-</span><span class="n">incubating</span><span
class="sr">/blog-sample/</span><span class="n">blog</span><span class="o">-</span><span
class="n">assembly</span><span class="o">/</span><span class="n">target</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span
class="o">-</span><span class="mf">0.2</span><span class="o">-</span><span
class="n">incubating</span><span class="sr">/blog-sample/</span><span
class="n">blog</span><span class="o">-</span><span class="n">assembly</span><span
class="o">/</span><span class="n">target</span>
 </pre></div>
 
 
 <p>now start Aries in an OSGi framework (we're using Eclipse Equinox in this
 case)</p>
-<div class="codehilite"><pre><span class="n">java</span> <span
class="o">-</span><span class="n">jar</span> <span class="n">osgi</span><span
class="o">-</span><span class="mi">3</span><span class="o">.</span><span
class="mi">5</span><span class="o">.</span><span class="mi">0</span><span
class="o">.</span><span class="n">v20090520</span><span class="o">.</span><span
class="n">jar</span> <span class="o">-</span><span class="n">console</span>
+<div class="codehilite"><pre><span class="n">java</span> <span
class="o">-</span><span class="n">jar</span> <span class="n">osgi</span><span
class="o">-</span><span class="mf">3.5.0</span><span class="o">.</span><span
class="n">v20090520</span><span class="o">.</span><span class="n">jar</span>
<span class="o">-</span><span class="n">console</span>
 </pre></div>
 
 



Mime
View raw message