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 2012/10/24 14:27:26 UTC
svn commit: r836012 [1/2] - /websites/staging/river/trunk/content/
Author: buildbot
Date: Wed Oct 24 12:27:25 2012
New Revision: 836012
Log:
Staging update by buildbot for river
Modified:
websites/staging/river/trunk/content/ (props changed)
websites/staging/river/trunk/content/about.html
websites/staging/river/trunk/content/building-a-release.html
websites/staging/river/trunk/content/building-river.html
websites/staging/river/trunk/content/ci.html
websites/staging/river/trunk/content/coding.html
websites/staging/river/trunk/content/concepts.html
websites/staging/river/trunk/content/development-process.html
websites/staging/river/trunk/content/discussion-futuredirection.html
websites/staging/river/trunk/content/discussion-internet.html
websites/staging/river/trunk/content/discussion-jarpackaging.html
websites/staging/river/trunk/content/documentation.html
websites/staging/river/trunk/content/downloads.html
websites/staging/river/trunk/content/found-a-bug.html
websites/staging/river/trunk/content/generics-javaspaces.html
websites/staging/river/trunk/content/get-involved.html
websites/staging/river/trunk/content/helloworld.html
websites/staging/river/trunk/content/index.html
websites/staging/river/trunk/content/mailing-lists.html
websites/staging/river/trunk/content/people.html
websites/staging/river/trunk/content/resources.html
websites/staging/river/trunk/content/roadmap.html
websites/staging/river/trunk/content/sitemap.html
websites/staging/river/trunk/content/source-code.html
websites/staging/river/trunk/content/success-stories.html
websites/staging/river/trunk/content/supported-platforms.html
websites/staging/river/trunk/content/testing-categories.html
websites/staging/river/trunk/content/user-guide-basic-river-services.html
websites/staging/river/trunk/content/user-guide-glossary.html
websites/staging/river/trunk/content/user-guide-river-jar-artifacts.html
websites/staging/river/trunk/content/user-guide-socketfactories.html
websites/staging/river/trunk/content/wot.html
Propchange: websites/staging/river/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 24 12:27:25 2012
@@ -1 +1 @@
-1393436
+1401646
Modified: websites/staging/river/trunk/content/about.html
==============================================================================
--- websites/staging/river/trunk/content/about.html (original)
+++ websites/staging/river/trunk/content/about.html Wed Oct 24 12:27:25 2012
@@ -66,7 +66,7 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="about_apache_river">About Apache River</h1>
+<h1 id="about-apache-river">About 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
@@ -85,7 +85,7 @@ computing environments.</p>
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -93,7 +93,7 @@ computing environments.</p>
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -139,15 +139,14 @@ computing environments.</p>
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -183,7 +182,7 @@ computing environments.</p>
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/building-a-release.html
==============================================================================
--- websites/staging/river/trunk/content/building-a-release.html (original)
+++ websites/staging/river/trunk/content/building-a-release.html Wed Oct 24 12:27:25 2012
@@ -66,21 +66,21 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="building_a_release_major_release">Building a release major release</h1>
+<h1 id="building-a-release-major-release">Building a release major release</h1>
<p>n.m n = major release number, m = minor release number</p>
-<h2 id="keys_file">KEYS file</h2>
+<h2 id="keys-file">KEYS file</h2>
<p>Add your key to the KEYS file in the repo</p>
-<h2 id="checkout_the_source">Checkout The Source</h2>
+<h2 id="checkout-the-source">Checkout The Source</h2>
<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</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">/river/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">river</span>
</pre></div>
-<h2 id="pre_release_checks">Pre release checks</h2>
+<h2 id="pre-release-checks">Pre release checks</h2>
<ul>
<li>River-trunk should run successful.</li>
<li>River-verify should run successful. (not yet?)</li>
</ul>
-<h2 id="gather_release_notes_from_jira">Gather Release Notes From Jira</h2>
+<h2 id="gather-release-notes-from-jira">Gather Release Notes From Jira</h2>
<p>First <a href="https://issues.apache.org/jira/secure/project/ViewProject.jspa?pid=12310600">manage the versions</a> of River using Jira. Make sure there is an appropriate release that Jira issues are have been assigned to. You can then view the <a href="https://issues.apache.org/jira/browse/RIVER#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel">Roadmap</a> screen in Jira to create the release and make sure that the correct Jira issues are associated to it.</p>
<p>Move the Jira issues around appropriately, especially if you're releasing before all the issues have been resolves. In this case, you need to postpone the remaining issues until a later release.</p>
<p>You can then use Jira to generate the release notes. This is done Road Map --> Release --> Summary --> Release Notes (next to "Filters").</p>
@@ -89,34 +89,34 @@
</pre></div>
-<h2 id="update_version_numbers">Update Version Numbers</h2>
+<h2 id="update-version-numbers">Update Version Numbers</h2>
<p>There are version numbers in the following places that need to be updated with the new release number/name.</p>
<ul>
<li>com.sun.jini.constants.VersionConstants.java (SERVER_VERSION)</li>
<li>river/trunk/src-doc/static/release-notes/index.html (version number)</li>
</ul>
<p>In the above HTML page, there is also a section on "changes by component" which should also be updated. This should be easy to do by referring to the Jira-generated release notes.</p>
-<h2 id="branch_the_repository">Branch the repository</h2>
+<h2 id="branch-the-repository">Branch the repository</h2>
<div class="codehilite"><pre><span class="n">svn</span> <span class="n">cp</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">/river/</span><span class="n">jtsk</span><span class="sr">/trunk https://svn.apache.org/</span><span class="n">repos</span><span class="sr">/asf/</span><span class="n">river</span><span class="sr">/jtsk/</span><span class="n">branches</span><span class="o">/</span><span class="nv">$VERSION</span>
</pre></div>
-<h2 id="tag_the_repository">Tag the repository</h2>
+<h2 id="tag-the-repository">Tag the repository</h2>
<div class="codehilite"><pre><span class="n">svn</span> <span class="n">cp</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">/river/</span><span class="n">jtsk</span><span class="sr">/trunk https://svn.apache.org/</span><span class="n">repos</span><span class="sr">/asf/</span><span class="n">river</span><span class="sr">/jtsk/</span><span class="n">tags</span><span class="o">/</span><span class="nv">$VERSION</span>
</pre></div>
-<h2 id="build_the_release_products">Build the release products</h2>
+<h2 id="build-the-release-products">Build the release products</h2>
<div class="codehilite"><pre><span class="n">ant</span> <span class="o">-</span><span class="n">Dversion</span><span class="o">=</span><span class="nv">$VERSION</span> <span class="n">clean</span> <span class="n">release</span>
</pre></div>
-<h2 id="rat_reports">Rat Reports</h2>
+<h2 id="rat-reports">Rat Reports</h2>
<div class="codehilite"><pre><span class="o">./</span><span class="n">rat_reports</span><span class="o">.</span><span class="n">sh</span>
</pre></div>
-<h2 id="sign_the_release">Sign the release</h2>
+<h2 id="sign-the-release">Sign the release</h2>
<ul>
<li><a href="http://www.apache.org/dev/release-signing.htm">General Apache Signing Details</a></li>
<li><a href="http://www.apache.org/dev/release-signing.html#sign-release">Release Signing Instructions</a> *See code below, link has a typo in it</li>
@@ -129,7 +129,7 @@ for f in $( ls ); do
done;</p>
</li>
</ul>
-<h2 id="test_the_release">Test the release</h2>
+<h2 id="test-the-release">Test the release</h2>
<div class="codehilite"><pre><span class="n">cp</span> <span class="n">dist</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">river</span><span class="o">-</span><span class="nv">$VERSION</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span> <span class="nv">$SOMEWHERE_ELSE</span>
<span class="n">cd</span> <span class="nv">$SOMEWHERE_ELSE</span>
<span class="n">tar</span> <span class="n">xvf</span> <span class="n">apache</span><span class="o">-</span><span class="n">river</span><span class="o">-</span><span class="nv">$VERSION</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span>
@@ -138,20 +138,20 @@ done;</p>
</pre></div>
-<h2 id="upload_the_release">Upload the release</h2>
+<h2 id="upload-the-release">Upload the release</h2>
<div class="codehilite"><pre><span class="n">scp</span> <span class="n">RAT</span><span class="o">*</span> <span class="n">username</span><span class="nv">@people</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org:</span><span class="o">~</span><span class="sr">/public_html/</span><span class="n">river</span><span class="o">/</span>
<span class="n">cd</span> <span class="n">dist</span>
<span class="n">scp</span> <span class="o">*</span> <span class="n">username</span><span class="nv">@people</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org:</span><span class="o">~</span><span class="sr">/public_html/</span><span class="n">river</span><span class="o">/</span>
</pre></div>
-<h2 id="allow_the_community_to_evaluate_the_release_products">Allow the community to evaluate the release products</h2>
+<h2 id="allow-the-community-to-evaluate-the-release-products">Allow the community to evaluate the release products</h2>
<div class="codehilite"><pre><span class="o">*</span> <span class="n">announce</span> <span class="n">availability</span> <span class="n">of</span> <span class="n">candidate</span> <span class="n">on</span> <span class="n">river</span><span class="o">-</span><span class="n">dev</span><span class="o">.</span>
<span class="o">*</span> <span class="n">start</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">thread</span><span class="o">.</span>
</pre></div>
-<h2 id="publish_release_on_website">Publish release on website</h2>
+<h2 id="publish-release-on-website">Publish release on website</h2>
<ul>
<li>checkout the site </li>
<li>Extract the javadocs from the release archive into ...</li>
@@ -165,7 +165,7 @@ done;</p>
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -173,7 +173,7 @@ done;</p>
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -219,15 +219,14 @@ done;</p>
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -263,7 +262,7 @@ done;</p>
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/building-river.html
==============================================================================
--- websites/staging/river/trunk/content/building-river.html (original)
+++ websites/staging/river/trunk/content/building-river.html Wed Oct 24 12:27:25 2012
@@ -297,7 +297,7 @@ Currently, River should be built with JD
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/ci.html
==============================================================================
--- websites/staging/river/trunk/content/ci.html (original)
+++ websites/staging/river/trunk/content/ci.html Wed Oct 24 12:27:25 2012
@@ -215,7 +215,7 @@ and tests the river-runtime with the riv
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/coding.html
==============================================================================
--- websites/staging/river/trunk/content/coding.html (original)
+++ websites/staging/river/trunk/content/coding.html Wed Oct 24 12:27:25 2012
@@ -66,7 +66,7 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="coding_conventions">Coding conventions</h1>
+<h1 id="coding-conventions">Coding conventions</h1>
<h2 id="indentation">Indentation</h2>
<p>Tabs are not used. Default indentation is 4 spaces.</p>
<h2 id="other">Other</h2>
@@ -77,7 +77,7 @@ and try to adhere as much as possible to
a clearly labeled 'reformatting' commit in between is recommended.
Keeping your reformatting changes limited,
reduces the change of merging conflicts by your fellow committers.</p>
-<h2 id="older_sources">Older sources</h2>
+<h2 id="older-sources">Older sources</h2>
<p>We do not actively search and reformat source files
that are not formatted according to this convention.</p>
<p>Older sources are best viewed with tab stops at 8 space
@@ -89,7 +89,7 @@ intervals.</p>
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -97,7 +97,7 @@ intervals.</p>
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -143,15 +143,14 @@ intervals.</p>
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -187,7 +186,7 @@ intervals.</p>
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/concepts.html
==============================================================================
--- websites/staging/river/trunk/content/concepts.html (original)
+++ websites/staging/river/trunk/content/concepts.html Wed Oct 24 12:27:25 2012
@@ -73,7 +73,7 @@ The basic communication between client a
<p>Client and service communicate with a protocol called JERI.
There are JERI implementations for plain-TCP, plain-SSL, HTTP, HTTPS and Kerberos-TCP.
For compatibility with RMI there is also a JRMP transport.</p>
-<h1 id="from_small_to_big">From small to big</h1>
+<h1 id="from-small-to-big">From small to big</h1>
<p>The smallest river system is comprised of a service and a client.
They only make use of JERI to communicate. No dynamic discovery is possible.</p>
<p>The next system in size is a combination of a service, client and a registry.
@@ -81,9 +81,9 @@ This allows for automatic discovery of c
The VM hosting the service registers the service in the registry.</p>
<p>For a system that also provides for ondemand distribution of compiled code, you will need a service,
client, registry and class-server.</p>
-<h1 id="basic_services">Basic services</h1>
+<h1 id="basic-services">Basic services</h1>
<p>There are several basic services. For locking, distributed events, leasing, transactions.</p>
-<h1 id="extended_services">Extended services</h1>
+<h1 id="extended-services">Extended services</h1>
<p>River has an implementation of 'Tuple spaces' called JavaSpaces.</p>
</div>
</td>
@@ -92,7 +92,7 @@ client, registry and class-server.</p>
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -100,7 +100,7 @@ client, registry and class-server.</p>
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -146,15 +146,14 @@ client, registry and class-server.</p>
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -190,7 +189,7 @@ client, registry and class-server.</p>
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/development-process.html
==============================================================================
--- websites/staging/river/trunk/content/development-process.html (original)
+++ websites/staging/river/trunk/content/development-process.html Wed Oct 24 12:27:25 2012
@@ -68,22 +68,22 @@
<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="#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>
+<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>
+<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>. More on this process: <a href="ci.html">Continuous Integration</a></p>
-<h2 id="tracking_issues_and_changes">Tracking issues and changes</h2>
+<h2 id="tracking-issues-and-changes">Tracking issues and changes</h2>
<ul>
<li>
<p>A JIRA issue is required for any substantive change.
@@ -97,7 +97,7 @@ In order to keep the list of JIRA issues
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>
+<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
@@ -105,7 +105,7 @@ The preferred place of discussion on iss
<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>
+<h2 id="code-reviews">Code Reviews</h2>
<ul>
<li>
<p>for public API changes:
@@ -118,7 +118,7 @@ The preferred place of discussion on iss
</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>
+<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>
@@ -127,7 +127,7 @@ The preferred place of discussion on iss
<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>
+<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/<m.n></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/<m.n></code> and likely merged into the <code>/trunk</code>.</p>
<p>Once a release candidate is ready for a first customer release <code>/branches/<m.n></code> is branched into <code>/tags/<m.n>.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/<m.n></code>. When a bug-fix release is ready it is branched into <code>/tags/<m.n.r></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>
@@ -189,7 +189,7 @@ The preferred place of discussion on iss
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -197,7 +197,7 @@ The preferred place of discussion on iss
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -243,15 +243,14 @@ The preferred place of discussion on iss
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -287,7 +286,7 @@ The preferred place of discussion on iss
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/discussion-futuredirection.html
==============================================================================
--- websites/staging/river/trunk/content/discussion-futuredirection.html (original)
+++ websites/staging/river/trunk/content/discussion-futuredirection.html Wed Oct 24 12:27:25 2012
@@ -174,7 +174,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/discussion-internet.html
==============================================================================
--- websites/staging/river/trunk/content/discussion-internet.html (original)
+++ websites/staging/river/trunk/content/discussion-internet.html Wed Oct 24 12:27:25 2012
@@ -66,7 +66,7 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="river_on_the_internet_roti">River on the Internet (roti)</h1>
+<h1 id="river-on-the-internet-roti">River on the Internet (roti)</h1>
<p>Please participate: <a href="http://wiki.apache.org/river/RiverOnTheInternet">http://wiki.apache.org/river/RiverOnTheInternet</a></p>
</div>
</td>
@@ -75,7 +75,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -83,7 +83,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -129,15 +129,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -173,7 +172,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/discussion-jarpackaging.html
==============================================================================
--- websites/staging/river/trunk/content/discussion-jarpackaging.html (original)
+++ websites/staging/river/trunk/content/discussion-jarpackaging.html Wed Oct 24 12:27:25 2012
@@ -190,7 +190,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/documentation.html
==============================================================================
--- websites/staging/river/trunk/content/documentation.html (original)
+++ websites/staging/river/trunk/content/documentation.html Wed Oct 24 12:27:25 2012
@@ -66,7 +66,7 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="apache_river_documentation">Apache River Documentation</h1>
+<h1 id="apache-river-documentation">Apache River Documentation</h1>
<p>The original Jini documentation (including the formal specifications) can be found <a href="http://river.apache.org/doc/index.html">here</a>. For more general help and information please see the list of topics below.</p>
<table>
<thead>
@@ -97,7 +97,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -105,7 +105,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -151,15 +151,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -195,7 +194,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/downloads.html
==============================================================================
--- websites/staging/river/trunk/content/downloads.html (original)
+++ websites/staging/river/trunk/content/downloads.html Wed Oct 24 12:27:25 2012
@@ -216,7 +216,7 @@ and the 2.1.x releases made during incub
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/found-a-bug.html
==============================================================================
--- websites/staging/river/trunk/content/found-a-bug.html (original)
+++ websites/staging/river/trunk/content/found-a-bug.html Wed Oct 24 12:27:25 2012
@@ -66,7 +66,7 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="found_a_bug">Found a Bug?</h1>
+<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 > 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>
@@ -78,7 +78,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -86,7 +86,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -132,15 +132,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -176,7 +175,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/generics-javaspaces.html
==============================================================================
--- websites/staging/river/trunk/content/generics-javaspaces.html (original)
+++ websites/staging/river/trunk/content/generics-javaspaces.html Wed Oct 24 12:27:25 2012
@@ -66,15 +66,15 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="generics_in_java_spaces">Generics in Java Spaces</h1>
+<h1 id="generics-in-java-spaces">Generics in Java Spaces</h1>
<p>There are currently several proposals beeing formed. </p>
-<h2 id="modification_of_javaspaces_interface">Modification of JavaSpaces interface</h2>
+<h2 id="modification-of-javaspaces-interface">Modification of JavaSpaces interface</h2>
<p>i.e.:</p>
<div class="codehilite"><pre><span class="n">public</span> <span class="o"><</span><span class="n">T</span> <span class="n">extends</span> <span class="n">Entry</span><span class="o">></span> <span class="n">T</span> <span class="nb">read</span><span class="p">(</span><span class="n">T</span> <span class="n">template</span><span class="p">,</span> <span class="n">Transaction</span> <span class="n">txn</span><span class="p">,</span> <span class="n">long</span> <span class="n">timeout</span><span class="p">)</span>
</pre></div>
-<h2 id="use_of_generics_in_entry_implementing_classes">Use of generics in Entry implementing classes</h2>
+<h2 id="use-of-generics-in-entry-implementing-classes">Use of generics in Entry implementing classes</h2>
</div>
</td>
<td valign="top">
@@ -82,7 +82,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -90,7 +90,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -136,15 +136,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -180,7 +179,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/get-involved.html
==============================================================================
--- websites/staging/river/trunk/content/get-involved.html (original)
+++ websites/staging/river/trunk/content/get-involved.html Wed Oct 24 12:27:25 2012
@@ -66,9 +66,9 @@
<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>
+<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>
+<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>
@@ -77,7 +77,7 @@
<li>Detailed and constructive feedback</li>
<li>Articles and whitepapers</li>
</ul>
-<h2 id="how_do_i_contribute">How do I Contribute?</h2>
+<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>
@@ -90,7 +90,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -98,7 +98,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -144,15 +144,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -188,7 +187,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/helloworld.html
==============================================================================
--- websites/staging/river/trunk/content/helloworld.html (original)
+++ websites/staging/river/trunk/content/helloworld.html Wed Oct 24 12:27:25 2012
@@ -280,7 +280,7 @@ ServiceStarter.main(config.riverConfig()
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/index.html
==============================================================================
--- websites/staging/river/trunk/content/index.html (original)
+++ websites/staging/river/trunk/content/index.html Wed Oct 24 12:27:25 2012
@@ -234,7 +234,7 @@ The River graduation is currently under
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/mailing-lists.html
==============================================================================
--- websites/staging/river/trunk/content/mailing-lists.html (original)
+++ websites/staging/river/trunk/content/mailing-lists.html Wed Oct 24 12:27:25 2012
@@ -66,7 +66,7 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="project_mailing_lists">Project Mailing Lists</h1>
+<h1 id="project-mailing-lists">Project Mailing Lists</h1>
<p>These are the mailing lists that have been established for the Apache River project. For each list, there is a subscribe, unsubscribe, and an archive link.</p>
<table>
<thead>
@@ -109,7 +109,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -117,7 +117,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -163,15 +163,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -207,7 +206,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/people.html
==============================================================================
--- websites/staging/river/trunk/content/people.html (original)
+++ websites/staging/river/trunk/content/people.html Wed Oct 24 12:27:25 2012
@@ -346,7 +346,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/resources.html
==============================================================================
--- websites/staging/river/trunk/content/resources.html (original)
+++ websites/staging/river/trunk/content/resources.html Wed Oct 24 12:27:25 2012
@@ -80,7 +80,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -88,7 +88,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -134,15 +134,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -178,7 +177,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/roadmap.html
==============================================================================
--- websites/staging/river/trunk/content/roadmap.html (original)
+++ websites/staging/river/trunk/content/roadmap.html Wed Oct 24 12:27:25 2012
@@ -78,7 +78,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -86,7 +86,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -132,15 +132,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -176,7 +175,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/sitemap.html
==============================================================================
--- websites/staging/river/trunk/content/sitemap.html (original)
+++ websites/staging/river/trunk/content/sitemap.html Wed Oct 24 12:27:25 2012
@@ -202,7 +202,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/source-code.html
==============================================================================
--- websites/staging/river/trunk/content/source-code.html (original)
+++ websites/staging/river/trunk/content/source-code.html Wed Oct 24 12:27:25 2012
@@ -66,23 +66,23 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="river_source_code">River source code</h1>
+<h1 id="river-source-code">River source code</h1>
<p>River uses <a href="http://subversion.tigris.org/">Subversion</a> to manage its source code. Instructions on Subversion use can be found <a href="http://svnbook.red-bean.com">here</a>.</p>
<p>The source code for the various deliverables of Apache River can be freely browsed at <a href="http://svn.apache.org/viewvc/river/">http://svn.apache.org/viewvc/river/</a>. </p>
-<h2 id="anonymous_access">Anonymous access</h2>
+<h2 id="anonymous-access">Anonymous access</h2>
<p>The Apache River source can be checked out anonymously with this command (for the jtsk deliverable):</p>
<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</span> <span class="n">http:</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">/river/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">river</span>
</pre></div>
-<h2 id="access_from_behind_a_firewall">Access from behind a firewall</h2>
+<h2 id="access-from-behind-a-firewall">Access from behind a firewall</h2>
<p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via HTTPS:</p>
<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</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">/river/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">river</span>
</pre></div>
-<h2 id="access_through_a_proxy">Access through a proxy</h2>
-<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
+<h2 id="access-through-a-proxy">Access through a proxy</h2>
+<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
<p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p>
<p>Example : Edit the 'servers' file and add something like :</p>
<div class="codehilite"><pre><span class="k">[global]</span>
@@ -91,14 +91,14 @@
</pre></div>
-<h2 id="submitting_a_patch">Submitting a Patch</h2>
+<h2 id="submitting-a-patch">Submitting a Patch</h2>
<p>If you make changes to River, and would like to contribute the to the project, you should create a patch and post it to the <a href="http://issues.apache.org/jira/browse/RIVER">River JIRA issue tracker</a>. To create a patch, simply execute the following command:</p>
<div class="codehilite"><pre><span class="n">svn</span> <span class="n">diff</span> <span class="o">></span> <span class="n">your</span><span class="o">-</span><span class="n">changes</span><span class="o">.</span><span class="n">patch</span>
</pre></div>
<p>If you've added new files, remember to "svn add" them so they get included in the diff.</p>
-<h2 id="developer_access">Developer Access</h2>
+<h2 id="developer-access">Developer Access</h2>
<p>Everyone can access the River Subversion repository via HTTPS, but River Committers must checkout the Subversion repository via HTTPS.</p>
<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</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">/river/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">river</span>
</pre></div>
@@ -124,7 +124,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -132,7 +132,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -178,15 +178,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -222,7 +221,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/success-stories.html
==============================================================================
--- websites/staging/river/trunk/content/success-stories.html (original)
+++ websites/staging/river/trunk/content/success-stories.html Wed Oct 24 12:27:25 2012
@@ -66,8 +66,8 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="success_stories">Success Stories</h1>
-<h2 id="jini_success_stories">Jini Success Stories</h2>
+<h1 id="success-stories">Success Stories</h1>
+<h2 id="jini-success-stories">Jini Success Stories</h2>
<ul>
<li><a href="http://www.jini.org/wiki/Who_uses_Jini%3F">Original Jini.org success stories</a>, including:<ol>
<li><a href="http://www.tno.nl/informatie-_en_communicatietechnologie/">TNO ICT, The Netherlands</a></li>
@@ -102,7 +102,7 @@
</ol>
</li>
</ol>
-<h2 id="sucden_financial_limited">Sucden Financial Limited</h2>
+<h2 id="sucden-financial-limited">Sucden Financial Limited</h2>
<blockquote>
<p><a href="http://www.sucdenfinancial.com/">Sucden Financial Limited</a> develops
its own futures and options trading system called STAR, built
@@ -149,7 +149,7 @@ Front Office Development Manager, Sucden
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -157,7 +157,7 @@ Front Office Development Manager, Sucden
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -203,15 +203,14 @@ Front Office Development Manager, Sucden
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -247,7 +246,7 @@ Front Office Development Manager, Sucden
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/supported-platforms.html
==============================================================================
--- websites/staging/river/trunk/content/supported-platforms.html (original)
+++ websites/staging/river/trunk/content/supported-platforms.html Wed Oct 24 12:27:25 2012
@@ -252,7 +252,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">
Modified: websites/staging/river/trunk/content/testing-categories.html
==============================================================================
--- websites/staging/river/trunk/content/testing-categories.html (original)
+++ websites/staging/river/trunk/content/testing-categories.html Wed Oct 24 12:27:25 2012
@@ -66,7 +66,7 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<h1 id="test_categories">Test categories</h1>
+<h1 id="test-categories">Test categories</h1>
<p>The test categories are;</p>
<ol>
<li>activation</li>
@@ -197,7 +197,7 @@
<div class="navigation_top">
<div class="navigation_bottom">
<!-- sidenav -->
-<h3 id="the_foundation">The Foundation</h3>
+<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">Thanks</a></li>
@@ -205,7 +205,7 @@
<li><a href="http://www.apache.org/security/">Security</a></li>
<li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
</ul>
-<h3 id="apache_river">Apache river</h3>
+<h3 id="apache-river">Apache river</h3>
<ul>
<li><a href="downloads.html">Downloads</a></li>
<li><a href="http://www.apache.org/licenses/">License</a></li>
@@ -251,15 +251,14 @@
<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
</ul>
<h3 id="search">Search</h3>
-<DIV>
+<p><DIV>
<form method="get" action="http://www.google.com/search" id="search" name="search" style="font-size: 10px;">
<input type="hidden" name="sitesearch" value="river.apache.org">
<input type="text" id="query" name="q" size="15" maxlength="255" >
<BR/>
<input type="submit" value="Search" id="submit"/>
</form>
-</DIV>
-
+</DIV></p>
<ul>
<li><a href="sitemap.html">Sitemap</a></li>
</ul>
@@ -295,7 +294,7 @@
<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 © 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>
+<p>Copyright © 2010 - 2012 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">