You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by bu...@apache.org on 2010/11/21 14:50:58 UTC

svn commit: r779457 [1/2] - /websites/staging/river/trunk/content/river/

Author: buildbot
Date: Sun Nov 21 13:50:58 2010
New Revision: 779457

URL: http://svn.apache.org/viewvc?rev=779457&view=rev
Log:
Staging update by buildbot

Added:
    websites/staging/river/trunk/content/river/
    websites/staging/river/trunk/content/river/building-river.html
    websites/staging/river/trunk/content/river/committers.html
    websites/staging/river/trunk/content/river/development-process.html
    websites/staging/river/trunk/content/river/documentation.html
    websites/staging/river/trunk/content/river/downloads.html
    websites/staging/river/trunk/content/river/found-a-bug.html
    websites/staging/river/trunk/content/river/get-involved.html
    websites/staging/river/trunk/content/river/index.html
    websites/staging/river/trunk/content/river/javadoc.html
    websites/staging/river/trunk/content/river/mailing-lists.html
    websites/staging/river/trunk/content/river/news.html
    websites/staging/river/trunk/content/river/sitemap.html
    websites/staging/river/trunk/content/river/source-code.html
    websites/staging/river/trunk/content/river/success-stories.html
    websites/staging/river/trunk/content/river/user-guide-basic-river-services.html
    websites/staging/river/trunk/content/river/user-guide-glossary.html
    websites/staging/river/trunk/content/river/user-guide-river-jar-artifacts.html
    websites/staging/river/trunk/content/river/user-guide-socketfactories.html

Added: websites/staging/river/trunk/content/river/building-river.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/building-river.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/building-river.html (added)
+++ websites/staging/river/trunk/content/river/building-river.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,384 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Building River</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="building_river">Building River</h1>
+<p>Before you can start building River a word of warning;</p>
+<h2 id="warning">Warning</h2>
+<p>The build process does not place nicely if you have spaces in your path names.  This includes the install path of the JDK.<br />
+</p>
+<p>This can be circumvented, at least on a Windows/Cygwin by using the first 6 characters of the name with a space in, and postfixing a tilde and the number 1.</p>
+<p>For example:</p>
+<div class="codehilite"><pre><span class="n">C:</span><span class="o">\</span><span class="n">Program</span> <span class="n">Files</span>
+</pre></div>
+
+
+<p>Would become:</p>
+<div class="codehilite"><pre><span class="n">C:</span><span class="o">\</span><span class="n">Progra</span><span class="o">~</span><span class="mi">1</span>
+</pre></div>
+
+
+<p>If the first six characters of your path name are not a unique name, for example if you have the two paths "C:Program Files" and "C:Program Something Else" then the number after the tilde may well be different.  It is suggested that you experiment using the Windows command shell to establish the correct 'tilde plus number' name for your path.</p>
+<p>So Windows users please be particular aware.  Also, where path separators are specified colons (:) should be used in preference to semi-colons (;)  even on Windows.</p>
+<h2 id="check_out_the_code">Check out the code</h2>
+<p>See <a href="source-code.html">this page</a> on how to check out the source code.</p>
+<h2 id="build_the_distribution">Build the distribution</h2>
+<p>River can be built simply by running Ant from where you checked the code out from.</p>
+<p>Assume "$RIVER_HOME" is where you have checked out the code to.</p>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="nv">$RIVER_HOME</span>
+<span class="n">ant</span>
+</pre></div>
+
+
+<p>Will build all the River JARs required.  You will then find them in the ${RIVER_HOME}/lib* directories.</p>
+<h2 id="testing_river">Testing River</h2>
+<p>This build process runs the (limited) suite of unit tests that comes with River.  River is tested predominantly by using <a href="http://openjdk.java.net/jtreg/">jtreg</a>.</p>
+<h3 id="using_the_ant_script">Using the Ant script</h3>
+<p>The QA tests can also be run from the Ant script.  You must make sure the Ant you are using is using the correct JDK.  You can run "ant diagnostics" in the project directory to find out which JVM Ant is using.</p>
+<p>Make sure that you have the following in your build.properties file.</p>
+<div class="codehilite"><pre><span class="n">river</span><span class="o">.</span><span class="n">home</span><span class="o">=</span><span class="nv">$RIVER_HOME</span>
+<span class="n">jtreg</span><span class="o">.</span><span class="n">home</span><span class="o">=</span><span class="sr">/path/</span><span class="n">to</span><span class="sr">/jtreg/i</span><span class="n">nstall</span>
+<span class="n">jdk1</span><span class="o">.</span><span class="mi">5</span><span class="o">.</span><span class="n">home</span><span class="o">=</span><span class="sr">/path/</span><span class="n">to</span><span class="o">/</span><span class="n">java1</span><span class="o">.</span><span class="mi">5</span> 
+<span class="n">jtreg</span><span class="o">.</span><span class="n">dir</span><span class="o">=</span><span class="nv">$RIVER_HOME</span><span class="sr">/jtsk/</span><span class="n">qa</span><span class="o">/</span><span class="n">jtreg</span>
+</pre></div>
+
+
+<p>Execute the following:</p>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="nv">$RIVER_HOME</span>
+<span class="n">cd</span> <span class="n">qa</span><span class="o">.</span><span class="n">run</span>
+</pre></div>
+
+
+<h4 id="running_just_a_few_tests">Running just a few tests</h4>
+<p>Running the entire QA suite tasks a significant portion of time; currently around the 17 hour mark.  It is therefore useful to be able to specify a subset of categories or even specific tests to run. </p>
+<h5 id="by_settings_in_the_properties_file">By settings in the properties file</h5>
+<p>When running the QA tests with Ant, this is done by including the following in the Ant build.properties file.</p>
+<div class="codehilite"><pre><span class="c1"># runs a specified category</span>
+<span class="c1"># e.g. run.categories=lookupservice</span>
+<span class="n">run</span><span class="o">.</span><span class="n">categories</span><span class="o">=</span><span class="n">name_of_category</span>
+
+<span class="c1"># runs a specified test</span>
+<span class="c1"># e.g. run.tests=com/sun/jini/test/spec/constraint/coreconstraint/PrincipalElementsTest.td</span>
+<span class="n">run</span><span class="o">.</span><span class="n">tests</span><span class="o">=</span><span class="n">path</span><span class="sr">/to/</span><span class="n">test</span><span class="o">/</span><span class="n">TestName</span><span class="o">.</span><span class="n">td</span>
+</pre></div>
+
+
+<h5 id="by_specifying_on_the_commandline">By specifying on the commandline</h5>
+<p>From the qa directory:</p>
+<div class="codehilite"><pre><span class="n">ant</span> <span class="o">-</span><span class="n">Drun</span><span class="o">.</span><span class="n">tests</span><span class="o">=</span><span class="n">com</span><span class="sr">/sun/</span><span class="n">jini</span><span class="sr">/test/s</span><span class="n">pec</span><span class="sr">/constraint/co</span><span class="n">reconstraint</span><span class="o">/</span><span class="n">PrincipalElementsTest</span><span class="o">.</span><span class="n">td</span> <span class="n">run</span><span class="o">-</span><span class="n">tests</span>
+</pre></div>
+
+
+<h5 id="single_test_files">Single test files</h5>
+<p>The td files can be found in;</p>
+<div class="codehilite"><pre><span class="nv">$RIVER_HOME</span><span class="sr">/qa/s</span><span class="n">rc</span><span class="o">/**</span>
+</pre></div>
+
+
+<h4 id="categories">Categories</h4>
+<p>The test categories are;</p>
+<ol>
+<li>activation</li>
+<li>activation_spec</li>
+<li>allgroups</li>
+<li>basicinvocationdispatcher</li>
+<li>basicinvocationdispatcher_spec</li>
+<li>basicinvocationhandler</li>
+<li>basicinvocationhandler_spec</li>
+<li>basicobjectendpoint</li>
+<li>basicobjectendpoint_spec</li>
+<li>config</li>
+<li>config_spec</li>
+<li>constraint</li>
+<li>constraint_spec</li>
+<li>coreconstraint</li>
+<li>coreconstraint_spec</li>
+<li>discardproblem</li>
+<li>discoverymanager</li>
+<li>discoverymanager_impl</li>
+<li>discoverymanager_spec</li>
+<li>discoveryproviders</li>
+<li>discoveryproviders_impl</li>
+<li>discoveryservice</li>
+<li>discoveryservice_impl</li>
+<li>discoveryservice_spec</li>
+<li>discoveryserviceevent</li>
+<li>discoveryservicelease</li>
+<li>end2end</li>
+<li>end2end_impl</li>
+<li>eventmailbox</li>
+<li>eventmailbox_impl</li>
+<li>eventmailbox_spec</li>
+<li>export</li>
+<li>export_spec</li>
+<li>fiddleradmin</li>
+<li>fiddlerfiddleradmin</li>
+<li>fiddlerjoinadmin</li>
+<li>id</li>
+<li>id_spec</li>
+<li>iiop</li>
+<li>iiop_spec</li>
+<li>impllocatordiscovery</li>
+<li>impllookupdiscovery</li>
+<li>implservicediscovery</li>
+<li>implservicediscoveryevent</li>
+<li>io</li>
+<li>io_spec</li>
+<li>javaspace</li>
+<li>javaspace05_conformance</li>
+<li>javaspace_conformance</li>
+<li>javaspace_impl</li>
+<li>javaspace_impl_admin</li>
+<li>javaspace_impl_api</li>
+<li>javaspace_impl_javaspace05</li>
+<li>javaspace_impl_leasing</li>
+<li>javaspace_impl_matching</li>
+<li>javaspace_impl_notify</li>
+<li>javaspace_impl_transaction</li>
+<li>javaspace_spec</li>
+<li>jeri</li>
+<li>jeri_spec</li>
+<li>joinmanager</li>
+<li>joinmanager_impl</li>
+<li>joinmanager_spec</li>
+<li>jrmp</li>
+<li>jrmp_spec</li>
+<li>loader</li>
+<li>loader_spec</li>
+<li>locatordiscovery</li>
+<li>locatordiscovery_impl</li>
+<li>locatordiscovery_spec</li>
+<li>lookupdiscovery</li>
+<li>lookupdiscovery_impl</li>
+<li>lookupdiscovery_spec</li>
+<li>lookupservice</li>
+<li>lookupservice_impl</li>
+<li>lookupservice_spec</li>
+<li>policyprovider</li>
+<li>policyprovider_spec</li>
+<li>proxytrust</li>
+<li>proxytrust_spec</li>
+<li>reliability</li>
+<li>renewalmanager</li>
+<li>renewalmanager_spec</li>
+<li>renewalservice</li>
+<li>renewalservice_impl</li>
+<li>renewalservice_spec</li>
+<li>scalability</li>
+<li>security</li>
+<li>security_spec</li>
+<li>servicediscovery</li>
+<li>servicediscovery_impl</li>
+<li>servicediscovery_spec</li>
+<li>servicediscoverycache</li>
+<li>servicediscoverydiscovery</li>
+<li>servicediscoveryevent</li>
+<li>servicediscoverylookup</li>
+<li>snapshot</li>
+<li>spec</li>
+<li>speclocatordiscovery</li>
+<li>speclookupdiscovery</li>
+<li>specservicediscovery</li>
+<li>specservicediscoverycache</li>
+<li>specservicediscoverydiscovery</li>
+<li>specservicediscoveryevent</li>
+<li>specservicediscoverylookup</li>
+<li>start</li>
+<li>start_impl</li>
+<li>stress</li>
+<li>test_set00</li>
+<li>test_set01</li>
+<li>test_set02</li>
+<li>test_set03</li>
+<li>test_set04</li>
+<li>thread</li>
+<li>thread_impl</li>
+<li>txnmanager</li>
+<li>txnmanager_impl</li>
+<li>txnmanager_spec</li>
+<li>url</li>
+<li>url_spec</li>
+</ol>
+<h3 id="using_jtreg_directly">Using jtreg directly</h3>
+<p>You must first download and install jtreg following the instructions on their site.</p>
+<p>Execute the following:</p>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="nv">$RIVER_HOME</span>
+<span class="n">cd</span> <span class="n">qa</span><span class="o">/</span><span class="n">jtreg</span>
+<span class="nb">mkdir</span> <span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span>
+<span class="n">cp</span> <span class="o">..</span><span class="sr">/lib/</span><span class="n">jsk</span><span class="o">-</span><span class="n">lib</span><span class="o">.</span><span class="n">jar</span> <span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span>
+<span class="n">cp</span> <span class="o">..</span><span class="sr">/lib/</span><span class="n">jsk</span><span class="o">-</span><span class="n">platform</span><span class="o">.</span><span class="n">jar</span> <span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span>
+<span class="n">cp</span> <span class="o">..</span><span class="sr">/lib/</span><span class="n">jsk</span><span class="o">-</span><span class="n">resources</span><span class="o">.</span><span class="n">jar</span> <span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span>
+<span class="n">cp</span> <span class="o">..</span><span class="sr">/lib/</span><span class="n">phoenix</span><span class="o">-</span><span class="n">init</span><span class="o">.</span><span class="n">jar</span> <span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span>
+<span class="n">cp</span> <span class="o">..</span><span class="sr">/lib-ext/</span><span class="n">jsk</span><span class="o">-</span><span class="n">policy</span><span class="o">.</span><span class="n">jar</span> <span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span>
+<span class="n">cd</span> <span class="nv">$RIVER_HOME</span>
+</pre></div>
+
+
+<p>Then to run the jtreg tests execute the following:</p>
+<div class="codehilite"><pre><span class="n">jtreg</span> <span class="o">-</span><span class="n">verbose:all</span><span class="p">,</span><span class="n">nopass</span> <span class="o">\</span>
+      <span class="o">-</span><span class="n">cpa:</span><span class="o">.</span><span class="sr">/qa/</span><span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span><span class="n">jsk</span><span class="o">-</span><span class="n">lib</span><span class="o">.</span><span class="n">jar:</span><span class="o">\</span>
+           <span class="o">.</span><span class="sr">/qa/</span><span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span><span class="n">jsk</span><span class="o">-</span><span class="n">platform</span><span class="o">.</span><span class="n">jar:</span><span class="o">\</span>
+           <span class="o">.</span><span class="sr">/qa/</span><span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span><span class="n">jsk</span><span class="o">-</span><span class="n">resources</span><span class="o">.</span><span class="n">jar:</span><span class="o">\</span>
+           <span class="o">.</span><span class="sr">/qa/</span><span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span><span class="o">/</span><span class="n">phoenix</span><span class="o">-</span><span class="n">init</span><span class="o">.</span><span class="n">jar:</span><span class="o">\</span>
+           <span class="o">.</span><span class="n">jsk</span><span class="o">-</span><span class="n">policy</span><span class="o">.</span><span class="n">jar</span> <span class="o">\</span>
+     <span class="o">-</span><span class="n">jdk</span> <span class="sr">/path/</span><span class="n">to</span><span class="o">/</span><span class="n">jdk1</span><span class="o">.</span><span class="mi">5</span> <span class="o">\</span>
+     <span class="o">-</span><span class="n">Djsk</span><span class="o">.</span><span class="n">home</span><span class="o">=</span><span class="s">&quot;/path/to/river/&quot;</span> <span class="o">\</span>
+     <span class="o">-</span><span class="n">Djava</span><span class="o">.</span><span class="n">security</span><span class="o">.</span><span class="n">debug</span><span class="o">=</span><span class="n">access</span><span class="p">,</span><span class="n">failure</span> <span class="o">\</span>
+     <span class="o">-</span><span class="n">Djavatest</span><span class="o">.</span><span class="n">maxOutputSize</span><span class="o">=</span><span class="mi">500000</span> <span class="o">\</span>
+     <span class="o">-</span><span class="n">Djtlib</span><span class="o">.</span><span class="n">tmp</span><span class="o">=.</span><span class="sr">/qa/</span><span class="n">jtreg</span><span class="o">/</span><span class="n">JTlib</span><span class="o">-</span><span class="n">tmp</span> <span class="o">\</span>
+     <span class="o">.</span><span class="sr">/qa/</span><span class="n">jtreg</span><span class="o">/</span>
+</pre></div>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/committers.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/committers.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/committers.html (added)
+++ websites/staging/river/trunk/content/river/committers.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,311 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Committers</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="committers">Committers</h1>
+<p>The people listed below are the set of committers to the Apache River project. They have all made significant contributions over time to Jini technology and the Jini Community.</p>
+<p>If you would like to contribute to Apache River, please engage on the <a href="mailing-lists.html">mailing lists</a>.</p>
+<p>If you would like to become a committer, please see the <a href="get-involved.html">Get Involved</a> page.</p>
+<p>Committers:</p>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Organization</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Bill Venners</td>
+<td>Artima, Inc.</td>
+</tr>
+<tr>
+<td>Mark Brouwer</td>
+<td />
+</tr>
+<tr>
+<td>Jim Waldo</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>John McClain</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Brian Murphy</td>
+<td />
+</tr>
+<tr>
+<td>Peter Jones</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Frank Barnaby</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Robert Resendes</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Vinod Johnson</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Ron Mann</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Jim Hurley</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Jonathan Costers</td>
+<td />
+</tr>
+<tr>
+<td>Peter Firmstone</td>
+<td />
+</tr>
+<tr>
+<td>Tom Hobbs</td>
+<td />
+</tr>
+<tr>
+<td>Sim IJskes</td>
+<td>QCG</td>
+</tr>
+<tr>
+<td>Patricia Shanahan</td>
+<td />
+</tr>
+<tr>
+<td>Greg Trasuk</td>
+<td>StratusCom Manufacturing Systems</td>
+</tr>
+</tbody>
+</table>
+<p>Emeriti:</p>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Organization</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Bob Scheifler</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Dan Creswell</td>
+<td />
+</tr>
+<tr>
+<td>Fred Oliver</td>
+<td>Sun Microsystems</td>
+</tr>
+<tr>
+<td>Geir Magnusson Jr</td>
+<td />
+</tr>
+<tr>
+<td>Nigel Daley</td>
+<td />
+</tr>
+<tr>
+<td>Juan Ramirez</td>
+<td>Sun Microsystems</td>
+</tr>
+</tbody>
+</table>
+<p>Mentors:</p>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Niclas Hedhman</td>
+</tr>
+<tr>
+<td>Jukka Zitting</td>
+</tr>
+<tr>
+<td>Benson Margulies</td>
+</tr>
+</tbody>
+</table>
+<p>Former mentors:</p>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Phil Steitz</td>
+</tr>
+<tr>
+<td>Gianugo Rabellino</td>
+</tr>
+</tbody>
+</table>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/development-process.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/development-process.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/development-process.html (added)
+++ websites/staging/river/trunk/content/river/development-process.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,274 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Development Process</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<div class="toc">
+<ul>
+<li><a href="#river_development_process">River Development Process</a><ul>
+<li><a href="#river_build_server">River build server</a></li>
+<li><a href="#tracking_issues_and_changes">Tracking issues and changes</a></li>
+<li><a href="#handling_security_-related_issues">Handling Security -related Issues</a></li>
+<li><a href="#code_reviews">Code Reviews</a></li>
+<li><a href="#testing">Testing</a></li>
+<li><a href="#version_numbering">Version Numbering</a></li>
+<li><a href="#branching_policy">Branching Policy</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="river_development_process">River Development Process</h1>
+<h2 id="river_build_server">River build server</h2>
+<p>River is built on the Apache Hudson server.  The projects can be found <a href="https://hudson.apache.org/hudson/view/M-R/view/River/">here</a>.</p>
+<h2 id="tracking_issues_and_changes">Tracking issues and changes</h2>
+<ul>
+<li>
+<p>A JIRA issue is required for any substantive change.
+In order to keep the list of JIRA issues under control, it is expected that any controversial issue or user request for a feature or design change be discussed on the dev list prior to entering it into JIRA.</p>
+</li>
+<li>
+<p>JIRA issues are not needed for small (e.g., typos) changes.</p>
+</li>
+<li>
+<p>Issue discussions
+The preferred place of discussion on issues is the river-dev mail list. A link to the beginning of the mail thread on the issue should be placed in the JIRA issue so that users looking through JIRA can easily view the thread of discussion on an issue. Please keep the Subject line the same so that the email thread hangs together.  It's also recommended that a summary/conclusion on the thread be recorded in the JIRA issue itself.</p>
+</li>
+</ul>
+<h2 id="handling_security_-related_issues">Handling Security -related Issues</h2>
+<p>There are three options associated with the "Security Level" field in the JIRA instance:
+<em> "None"
+</em> "Security risk, visible to committers" - only committers have access to the issue with this option set
+* "Security risk, visible to anyone" - the issue has a security risk associated with it, and the committers understand the impact. A resolution/fix has been developed.</p>
+<p>When a potential security -related issue is identified in the River sourcebase, initial discussion on it should occur on the private PPMC list.  If the person(s) who identified the issue are not on the PPMC, they should be included in the discussion.</p>
+<p>If the issue is acknowledged as a valid security issue, a JIRA issue needs to be created with the "Security Level" field marked to "Security risk, visible to committers".</p>
+<p>As soon as appropriate (for example, when the impact is understood and/or there is a resolution/fix developed), the "Security Level" should be changed to "Security risk, visible to anyone" and an explanation/discussion should occur in the broader River community on the river-dev list.</p>
+<h2 id="code_reviews">Code Reviews</h2>
+<ul>
+<li>
+<p>for public API changes:
+<a href="http://apache.org/foundation/glossary.html#ReviewThenCommit">RTC</a> These changes have potentially broad effects on developers and users, and therefore will require a code review and vote. Since some of these changes will affect the API docs ('specs'), everyone within the Jini/River community is encouraged to review and vote. The Committer votes are binding, but the sentiment of the entire community will be strongly considered.</p>
+</li>
+<li>
+<p>for all other changes:
+<a href="http://apache.org/foundation/glossary.html#CommitThenReview">CTR</a> Although CTR is what is specified, developers should feel comfortable requesting the list for peer review before committing.</p>
+</li>
+</ul>
+<h2 id="testing">Testing</h2>
+<p>Developing test cases and running test suites are desired but not required prior to an integration.  If unit tests are created for a change, the developer is encouraged to add them to the JIRA issue for sharing.</p>
+<h2 id="version_numbering">Version Numbering</h2>
+<p>Each Apache River deliverable has a version number of:</p>
+<p><code>m.n.r</code></p>
+<ul>
+<li><code>m</code> = major version</li>
+<li><code>n</code> = minor version</li>
+<li><code>r</code> = maintenance version</li>
+</ul>
+<p>The major version number will in general only be increased in case of major changes that might introduce compatibility problems or represent some fundamental improvements. The minor versions reflect the various feature releases, the last part of the version number reflects the maintenance release.</p>
+<h2 id="branching_policy">Branching Policy</h2>
+<p>Ongoing development for the next release takes place in the <code>/trunk</code>. Once feature complete for a (non maintenance) release the trunk is branched into <code>/branches/&lt;m.n&gt;</code> which in general also reflects the moment a release candidate is presented to the public in a fairly short period of time. Ongoing development continues in the <code>/trunk</code>, issues found against the release candidate will be fixed in <code>/branches/&lt;m.n&gt;</code> and likely merged into the <code>/trunk</code>.</p>
+<p>Once a release candidate is ready for a first customer release <code>/branches/&lt;m.n&gt;</code> is branched into <code>/tags/&lt;m.n&gt;.0</code>. When support is required for a particular release <code>m.n</code>, the development for a fix-release is conducted in <code>/branches/&lt;m.n&gt;</code>. When a bug-fix release is ready it is branched into <code>/tags/&lt;m.n.r&gt;</code> where <code>r</code> is a positive number and increased for each maintenance release.</p>
+<p>Although ongoing development should take place in <code>/trunk</code>, there is a <code>/skunk</code> branch that can be utilized for 'experimental' work that must not disturb the <code>/trunk</code>, that needs to be visible to others and/or might require participation of others. In general the lifetime of such branch should be short to give it a chance of successful integration into the <code>/trunk</code> when the 'experiment' has been found valuable.</p>
+<p><em>Summarized</em></p>
+<table>
+<thead>
+<tr>
+<th>branch</th>
+<th>description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code>.../river/&lt;product&gt;/trunk</code></td>
+<td>mainline development</td>
+</tr>
+<tr>
+<td><code>.../river/&lt;product&gt;/branches</code></td>
+<td>maintenance branches</td>
+</tr>
+<tr>
+<td><code>.../river/&lt;product&gt;/tags</code></td>
+<td>frozen release tags</td>
+</tr>
+<tr>
+<td><code>.../river/&lt;product&gt;/skunk</code></td>
+<td>development and 'skunk works' branches</td>
+</tr>
+</tbody>
+</table>
+<pre>
+/trunk
+   |
+   |--------  /branches/2.1/
+   |        \
+   |         \ -------  /tags/2.1.0/
+   |          \
+   |           \ -------  /tags/2.1.1/
+   |            \
+   |
+   |--------  /branches/2.2/
+   |        \
+   |         \ -------  /tags/2.2.0/
+   |          \
+   |
+   |--------  /skunk/<catchy_name>
+   |
+   |
+   |--------  /branches/3.0/
+   |        \
+   |         \ -------  /tags/3.0.0/
+   |          \
+   |           \ -------  /tags/3.0.1/
+</pre>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/documentation.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/documentation.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/documentation.html (added)
+++ websites/staging/river/trunk/content/river/documentation.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,182 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Documentation</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="apache_river_documentation">Apache River Documentation</h1>
+<p>The original Jini documentation (including the formal specifications) can be found <a href="http://incubator.apache.org/river/doc/index.html">here</a>.  For more general help and information please see the list of topics below.</p>
+<table>
+<thead>
+<tr>
+<th>Document</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="user-guide-glossary.html">Glossary</a></td>
+<td>A definition of a few of the common terms when using Jini/River</td>
+</tr>
+<tr>
+<td><a href="user-guide-river-jar-artifacts.html">River Artifacts</a></td>
+<td>An extract from the developer list discussing the history behind River's JAR artifacts</td>
+</tr>
+<tr>
+<td><a href="user-guide-socketfactories.html">Socket Factories</a></td>
+<td>A note on the correct use of SocketFactories in EndPoints</td>
+</tr>
+</tbody>
+</table>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/downloads.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/downloads.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/downloads.html (added)
+++ websites/staging/river/trunk/content/river/downloads.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,191 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Downloads</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="apache_river_downloads">Apache River Downloads</h1>
+<p>Use the links below to download Apache River releases from one of our mirrors. You should verify the integrity of the files using the signatures and checksums available from this page.</p>
+<p>Apache River releases are available under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. See the NOTICE.txt file contained in each release artifact for applicable copyright attribution notices.</p>
+<h2 id="apache_river_v212_incubating">Apache River v2.1.2 (incubating)</h2>
+<ul>
+<li>Source code: <a href="http://www.apache.org/dyn/closer.cgi/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip">apache-river-2.1.2-incubating-src.zip</a> (<a href="http://www.apache.org/dist/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip.asc">PGP</a>, <a href="http://www.apache.org/dist/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip.sha">SHA1</a>)</li>
+<li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip">apache-river-2.1.2-incubating-bin.zip</a> (<a href="http://www.apache.org/dist/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip.asc">PGP</a>, <a href="http://www.apache.org/dist/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip.sha">SHA1</a>)</li>
+</ul>
+<h2 id="release_archive">Release Archive</h2>
+<p>Only current, recommended releases are available on www.apache.org and the mirror sites. Older releases, when available, can be obtained from the <a href="http://archive.apache.org/dist/incubator/river/">archive site</a>.</p>
+<h2 id="nightly_snapshots">Nightly Snapshots</h2>
+<p>Being worked on - none yet.</p>
+<h2 id="pgp_signatures">PGP Signatures</h2>
+<p>All of the release distribution packages have been digitally signed (using PGP or GPG) by the Apache Group members that constructed them. There will be an accompanying distribution.asc file in the same directory as the distribution. The PGP keys can be found in the MIT key repository (hkp://pgp.mit.edu), the OpenPGP Public Key repository (hkp://subkeys.pgp.net), and within this project's KEYS file, which is located within each download directory.</p>
+<p>Always use the signature files to verify the authenticity of the distribution, e.g.,</p>
+<div class="codehilite"><pre><span class="c">% pgpk -a KEYS</span>
+<span class="c">% pgpv filename.zip.asc</span>
+</pre></div>
+
+
+<p>or,</p>
+<div class="codehilite"><pre><span class="c">% pgp -ka KEYS</span>
+<span class="c">% pgp filename.zip.asc</span>
+</pre></div>
+
+
+<p>or,</p>
+<div class="codehilite"><pre><span class="c">% gpg --import KEYS</span>
+<span class="c">% gpg --verify filename.zip.asc</span>
+</pre></div>
+
+
+<p>We offer MD5 hashes as an alternative to validate the integrity of the downloaded files. A unix program called md5 or md5sum is included in many unix distributions. It is also available as part of <a href="http://www.gnu.org/software/coreutils">GNU Core Utilities package</a>.</p>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/found-a-bug.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/found-a-bug.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/found-a-bug.html (added)
+++ websites/staging/river/trunk/content/river/found-a-bug.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Found a Bug</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="found_a_bug">Found a Bug?</h1>
+<p>If you think you've found a problem with Apache River you can search JIRA, our issue-tracking system, to see if the problem has already been noted (visit <a href="http://issues.apache.org/jira/browse/RIVER">JIRA</a>). If the issue is not listed there, you can add a new JIRA issue describing it, please include detailed steps to reproduce the problem. Often it is best to raise an issue not yet listed in JIRA first on the River Developer mailing list (see <a href="mailing-lists.html">Mailing Lists</a>) before adding it directly in JIRA.</p>
+<p>If you have a fix for the issue, you can generate a patch file to send the fix to us. You need to check out the current source code from Subversion, make the necessary changes, and then do a full build. And, of course, confirm that the problem is actually fixed. Then, go to the base directory of your RIVER checkout, and run a command like <code>svn diff &gt; fix-for-my-bug.patch</code> to generate a patch file.</p>
+<p>To submit a patch, create an issue in JIRA that describes the problem, and add your patch file as an attachment. Please include detailed steps to reproduce the problem in the issue description, and a test case in the patch where possible.</p>
+<p>Thanks for interest, and working with us to improve Apache River!</p>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/get-involved.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/get-involved.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/get-involved.html (added)
+++ websites/staging/river/trunk/content/river/get-involved.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,175 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Get Involved</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="join_the_apache_river_community">Join the Apache River Community</h1>
+<p>The Apache River project is being built by the open source community for the open source community. We truly welcome your input and contributions!</p>
+<h2 id="what_we_are_looking_for">What we are looking for:</h2>
+<ul>
+<li>Bug fixes and code enhancement contributions</li>
+<li>Source code contributions</li>
+<li>Documentation assistance and contributions</li>
+<li>Feature suggestions</li>
+<li>Detailed and constructive feedback</li>
+<li>Articles and whitepapers</li>
+</ul>
+<h2 id="how_do_i_contribute">How do I Contribute?</h2>
+<ul>
+<li>To discuss Apache River topics check out the <a href="mailing-lists.html">mailing lists</a>.</li>
+<li>Bugs and other issues can be posted in the <a href="http://issues.apache.org/jira/browse/RIVER">RIVER</a> issue tracker.</li>
+<li>The <a href="http://wiki.apache.org/river/">River wiki</a> is open for anyone to contribute related documentation.</li>
+</ul>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/index.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/index.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/index.html (added)
+++ websites/staging/river/trunk/content/river/index.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,179 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Index</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="welcome_to_apache_river">Welcome to Apache River</h1>
+<p>Welcome to Apache River, a project furthering the development and advancement of Jini technology.</p>
+<p>Jini is a service oriented architecture that defines a programming model which both exploits and extends Java technology to enable the construction of secure, distributed systems consisting of federations of services and clients. Jini technology can be used to build adaptive network systems that are scalable, evolvable and flexible as typically required in dynamic computing environments.</p>
+<p>Apache River is an effort undergoing incubation at <a href="http://www.apache.org/">The Apache Software Foundation</a> (ASF), sponsored by the <a href="http://incubator.apache.org/">Apache Incubator</a> PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+<h1 id="news">News</h1>
+<h2 id="apache_river_212_incubation_release">Apache River 2.1.2 Incubation Release</h2>
+<p>After successfully passing the vote request, the latest Apache River Incubation Release is available for download. </p>
+<h2 id="vote_for_apache_river_212_incubation_release">Vote for Apache River 2.1.2 Incubation Release</h2>
+<p>After much preparation and many improvements to the source build process and testing, the Apache River 2.1.2 incubation release candidate is available for preview at <a href="http://people.apache.org/~peter_firmstone/">http://people.apache.org/~peter_firmstone/</a></p>
+<p>Feel free to join in and assist by installing and checking our release candidate or participate in Apache River development.</p>
+<h2 id="project_vote_approves_v211_incubating_release_candidate">Project Vote approves v2.1.1 incubating Release Candidate</h2>
+<p>The first project release (v2.1.1 incubating) from the River project has been approved by the River Community.</p>
+<p><a href="http://mail-archives.apache.org/mod_mbox/incubator-river-dev/200801.mbox/%3CD757B3BB-33B4-4984-BE51-624A7C3FCC19@mac.com%3E">Here</a> are the Vote Results</p>
+<p>Next step is to get Apache Incubator approval for the release.</p>
+<h1 id="resources">Resources</h1>
+<ul>
+<li>Apache Incubator <a href="http://wiki.apache.org/incubator/RiverProposal">Proposal for the River project </a></li>
+<li><a href="http://www.jini.org">Jini.org </a></li>
+<li><a href="http://jini.dev.java.net">Jini project area on Java.net </a></li>
+<li>Jan Newmarch's <a href="http://jan.newmarch.name/java/jini/tutorial/Jini.xml">Guide to Jini Technologies </a></li>
+</ul>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>

Added: websites/staging/river/trunk/content/river/javadoc.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river/javadoc.html?rev=779457&view=auto
==============================================================================
--- websites/staging/river/trunk/content/river/javadoc.html (added)
+++ websites/staging/river/trunk/content/river/javadoc.html Sun Nov 21 13:50:58 2010
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+	<link href="/river/css/site.css" rel="stylesheet" type="text/css">
+	<link href="/river/css/type-settings.css" rel="stylesheet" type="text/css">
+
+	<title>Apache River - Javadoc</title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+
+<!-- Banner -->
+                                                                        
+                                                                        
+            <div id="header_background">
+	<div id="river_logo">
+		<a href="/river"><img src="/river/images/apache_river_v2b_small.png"/></a>
+<img src="/images/apache-incubator-logo.png"/>
+
+	</div>
+	</div>
+                                    
+    <table border="0">
+    <tbody>
+        <tr>
+        <td style="overflow: hidden;" valign="top" width="100%">
+          <div class="wiki-content">
+<h1 id="apache_river_javadoc">Apache River Javadoc</h1>
+<p>The javadocs generated from the latest, unreleased version of River can be browsed at:
+<a href="https://hudson.apache.org/hudson/job/River-trunk/ws/jtsk/trunk/doc/api/index.html">https://hudson.apache.org/hudson/job/River-trunk/ws/jtsk/trunk/doc/api/index.html</a></p>
+          </div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+              <div class="navigation_bottom"> 
+<!-- sidenav -->                                                                        
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="news.html">News</a></li>
+</ul>
+<h3 id="community">Community</h3>
+<ul>
+<li><a href="get-involved.html">Get Involved</a></li>
+<li><a href="license.txt">License</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li>Documentation<ul>
+<li><a href="http://incubator.apache.org/river/doc/index.html">Original Jini Wiki</a></li>
+<li><a href="user-guide-glossary.html">Glossary</a></li>
+<li><a href="documentation.html">Cookbook</a></li>
+<li><a href="javadoc.html">Javadoc</a></li>
+</ul>
+</li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="committers.html">Committers</a></li>
+<li><a href="found-a-bug.html">Found a Bug</a>?</li>
+</ul>
+<h3 id="development">Development</h3>
+<ul>
+<li><a href="javadoc.html">Javadoc</a></li>
+<li><a href="source-code.html">Source Code</a></li>
+<li><a href="building-river.html">Building River</a></li>
+<li><a href="development-process.html">Development Process</a></li>
+<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
+<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
+</ul>
+<h3 id="search">Search</h3>
+<DIV>
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
+</FORM>
+</DIV>
+
+<ul>
+<li><a href="sitemap.html">Sitemap</a></li>
+</ul>
+<h3 id="the_foundation">The Foundation</h3>
+<ul>
+<li><a href="http://www.apache.org">Apache</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Sponsors</a></li>
+<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+<li><a href="http://incubator.apache.org/">Incubator</a></li>
+</ul>
+<!-- sidenav -->                                                                        
+              </div>
+            </div>   
+          </div>
+        </td>
+        </tr>
+    </tbody>
+        </table>
+
+<!--
+        <div class="bottom_red_bar"></div>
+-->
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<!--
+<div class="design_attribution">Page Template Design By Marc Prud'hommeaux based on <a href="http://activemq.apache.org/">ActiveMQ template</a></div>
+-->
+<div class="copyright_footer">
+<p>Copyright &copy; 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+<script src="skeleton_files/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-1940143-1";
+urchinTracker();
+</script>
+
+</body></html>