river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r887844 [1/2] - /websites/staging/river/trunk/content/
Date Sat, 23 Nov 2013 20:33:39 GMT
Author: buildbot
Date: Sat Nov 23 20:33:38 2013
New Revision: 887844

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/networking.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 Sat Nov 23 20:33:38 2013
@@ -1 +1 @@
-1544874
+1544877

Modified: websites/staging/river/trunk/content/about.html
==============================================================================
--- websites/staging/river/trunk/content/about.html (original)
+++ websites/staging/river/trunk/content/about.html Sat Nov 23 20:33:38 2013
@@ -96,6 +96,7 @@ computing environments.</p>
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -139,14 +140,15 @@ computing environments.</p>
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -71,7 +71,7 @@
 <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>
-<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>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">river</span>
 </pre></div>
 
 
@@ -85,7 +85,7 @@
 <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 --&gt; Release --&gt; Summary --&gt; Release Notes (next to "Filters").</p>
 <p>The release notes need to be pasted into;</p>
-<div class="codehilite"><pre><span class="n">river</span><span class="sr">/trunk/s</span><span class="n">rc</span><span class="o">-</span><span class="n">doc</span><span class="sr">/static/</span><span class="n">release</span><span class="o">-</span><span class="n">notes</span><span class="o">/</span><span class="nb">index</span><span class="o">.</span><span class="n">html</span>
+<div class="codehilite"><pre><span class="n">river</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">src</span><span class="o">-</span><span class="n">doc</span><span class="o">/</span><span class="n">static</span><span class="o">/</span><span class="n">release</span><span class="o">-</span><span class="n">notes</span><span class="o">/</span><span class="n">index</span><span class="p">.</span><span class="n">html</span>
 </pre></div>
 
 
@@ -97,22 +97,22 @@
 </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>
-<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>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">cp</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">
 branches</span><span class="o">/</span>$<span class="n">VERSION</span>
 </pre></div>
 
 
 <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>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">cp</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">
 tags</span><span class="o">/</span>$<span class="n">VERSION</span>
 </pre></div>
 
 
 <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>
+<div class="codehilite"><pre><span class="n">ant</span> <span class="o">-</span><span class="n">Dversion</span><span class="p">=</span>$<span class="n">VERSION</span> <span class="n">clean</span> <span class="n">release</span>
 </pre></div>
 
 
 <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>
+<div class="codehilite"><pre><span class="o">./</span><span class="n">rat_reports</span><span class="p">.</span><span class="n">sh</span>
 </pre></div>
 
 
@@ -130,24 +130,24 @@ done;</p>
 </li>
 </ul>
 <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>
-<span class="n">cd</span> <span class="n">apache</span><span class="o">-</span><span class="n">river</span><span class="o">-</span><span class="nv">$VERSION</span>
+<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="n">VERSION</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span> $<span class="n">SOMEWHERE_ELSE</span>
+<span class="n">cd</span> $<span class="n">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="n">VERSION</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span>
+<span class="n">cd</span> <span class="n">apache</span><span class="o">-</span><span class="n">river</span><span class="o">-</span>$<span class="n">VERSION</span>
 <span class="n">ant</span> <span class="n">build</span>
 </pre></div>
 
 
 <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>
+<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="p">@</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span><span class="o">~/</span><span class="n">public_html</span><span class="o">/</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>
+<span class="n">scp</span> <span class="o">*</span> <span class="n">username</span><span class="p">@</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span><span class="o">~/</span><span class="n">public_html</span><span class="o">/</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>
-<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>
+<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="p">.</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="p">.</span>
 </pre></div>
 
 
@@ -176,6 +176,7 @@ done;</p>
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -219,14 +220,15 @@ done;</p>
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -76,20 +76,18 @@
 <p>The rest is included in the source archive, and in the SVN.</p>
 <p>This article also describes how to setup your IDE to compile River.</p>
 <h2 id="warning-spaces-in-paths">(warning) Spaces in paths</h2>
-<p>The build process does not play nicely if you have spaces in your path names.  This includes the install path of the JDK.<br />
-</p>
+<p>The build process does not play nicely if you have spaces in your path names.  This includes the install path of the JDK.  </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; <code>C:\Program Files</code> would become; <code>C:\Progra~1</code></p>
 <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.<br />
-</p>
+<p>So Windows users please be particular aware.  </p>
 <p>If you are running on Windows, it is also advisable to use a forward slash '/' are the path separator.  This is acceptable to both Java and Ant, and has the added benefit that the paths will be correct if you decide to run the JTREG tests (some of which require a Unix-like/Cygwin environment to run scripts in).  This is particularly important for the <code>river.home</code> property which is inherited from in the <code>qa/build.xml</code> file and subsequently passed onto the various classes which make up the jtreg tests.</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>
+<div class="codehilite"><pre><span class="n">cd</span> $<span class="n">RIVER_HOME</span>
 <span class="n">ant</span>
 </pre></div>
 
@@ -97,14 +95,11 @@
 <p>Will build all the River JARs required.  You will then find them in the ${RIVER_HOME}/lib* directories.</p>
 <h2 id="setting-up-the-ide">Setting up the IDE</h2>
 <h3 id="eclipse">Eclipse</h3>
-<p>Create your new IDE project using your prefered method (e.g. "Import from SVN" or create a new project using existing source, etc).<br />
-</p>
-<p>First you will need to create a new JDK system library.  The normal JDK libraries that come in Eclipse have restrictions place on the <code>rt.jar</code> file which prevents the import of some proprietary Sun classes.<br />
-</p>
+<p>Create your new IDE project using your prefered method (e.g. "Import from SVN" or create a new project using existing source, etc).  </p>
+<p>First you will need to create a new JDK system library.  The normal JDK libraries that come in Eclipse have restrictions place on the <code>rt.jar</code> file which prevents the import of some proprietary Sun classes.  </p>
 <p>Since River is built with Ant this isn't strictly necessary, but it is if you don't want the compiler error warnings flashing up.<br />
 Currently, River should be built with JDK 6 (-source 5), so please ensure that you have this installed and your new library uses it.</p>
-<p>Then you need to add the JARs in <code>$RIVER_HOME/extlibs</code> to your classpath.<br />
-</p>
+<p>Then you need to add the JARs in <code>$RIVER_HOME/extlibs</code> to your classpath.  </p>
 <p>That should everything that Eclipse needs to be happy with the River code.</p>
 <h3 id="netbeans">NetBeans</h3>
 <ul>
@@ -125,10 +120,10 @@ Currently, River should be built with JD
 <h2 id="the-qa-test-suite">The QA Test Suite</h2>
 <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 which you will need to create in <code>$RIVER_HOME</code>.</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="mf">.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="mf">.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>
+<div class="codehilite"><pre><span class="n">river</span><span class="p">.</span><span class="n">home</span><span class="p">=</span>$<span class="n">RIVER_HOME</span>
+<span class="n">jtreg</span><span class="p">.</span><span class="n">home</span><span class="p">=</span><span class="o">/</span><span class="n">path</span><span class="o">/</span><span class="n">to</span><span class="o">/</span><span class="n">jtreg</span><span class="o">/</span><span class="n">install</span>
+<span class="n">jdk1</span><span class="p">.</span>5<span class="p">.</span><span class="n">home</span><span class="p">=</span><span class="o">/</span><span class="n">path</span><span class="o">/</span><span class="n">to</span><span class="o">/</span><span class="n">java1</span><span class="p">.</span>5 
+<span class="n">jtreg</span><span class="p">.</span><span class="n">dir</span><span class="p">=</span>$<span class="n">RIVER_HOME</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">qa</span><span class="o">/</span><span class="n">jtreg</span>
 </pre></div>
 
 
@@ -136,8 +131,8 @@ Currently, River should be built with JD
 <p>Please note the remark above about using paths which contains spaces and the use of '/' over '\'.</p>
 </blockquote>
 <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>
+<div class="codehilite"><pre><span class="n">cd</span> $<span class="n">RIVER_HOME</span>
+<span class="n">cd</span> <span class="n">qa</span><span class="p">.</span><span class="n">run</span>
 </pre></div>
 
 
@@ -145,19 +140,19 @@ Currently, River should be built with JD
 <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>
 <h4 id="by-settings-in-the-properties-file">By settings in the properties file</h4>
 <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>
+<div class="codehilite"><pre><span class="c"># runs a specified category</span>
+<span class="c"># e.g. run.categories=lookupservice</span>
+<span class="nb">run</span><span class="p">.</span><span class="n">categories</span><span class="p">=</span><span class="n">name_of_category</span>
+
+<span class="c"># runs a specified test</span>
+<span class="c"># e.g. run.tests=com/sun/jini/test/spec/constraint/coreconstraint/PrincipalElementsTest.td</span>
+<span class="nb">run</span><span class="p">.</span><span class="n">tests</span><span class="p">=</span><span class="nb">path</span><span class="o">/</span><span class="n">to</span><span class="o">/</span><span class="nb">test</span><span class="o">/</span><span class="n">TestName</span><span class="p">.</span><span class="n">td</span>
 </pre></div>
 
 
 <h4 id="by-specifying-on-the-commandline">By specifying on the commandline</h4>
 <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>
+<div class="codehilite"><pre><span class="n">ant</span> <span class="o">-</span><span class="n">Drun</span><span class="p">.</span><span class="n">tests</span><span class="p">=</span><span class="n">com</span><span class="o">/</span><span class="n">sun</span><span class="o">/</span><span class="n">jini</span><span class="o">/</span><span class="n">test</span><span class="o">/</span><span class="n">spec</span><span class="o">/</span><span class="n">constraint</span><span class="o">/</span><span class="n">coreconstraint</span><span class="o">/</span><span class="n">PrincipalElementsTest</span><span class="p">.</span><span class="n">td</span> <span class="n">run</span><span class="o">-</span><span class="n">tests</span>
 </pre></div>
 
 
@@ -168,7 +163,7 @@ Currently, River should be built with JD
 <p>You must first download and install jtreg following the instructions on their site.</p>
 <p>Some of these tests are run as BASH scripts, therefore, if running the jtreg tests on Windows a Cygwin (or similar) environment is necessary.</p>
 <p>The JTREG tests can then be run by execute the following:</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="nv">$RIVER_HOME</span><span class="o">/</span><span class="n">qa</span>
+<div class="codehilite"><pre><span class="n">cd</span> $<span class="n">RIVER_HOME</span><span class="o">/</span><span class="n">qa</span>
 <span class="n">ant</span> <span class="n">harness</span><span class="o">-</span><span class="n">runtime</span>
 <span class="n">ant</span> <span class="n">jtreg</span>
 </pre></div>
@@ -211,6 +206,7 @@ Currently, River should be built with JD
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -254,14 +250,15 @@ Currently, River should be built with JD
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/ci.html
==============================================================================
--- websites/staging/river/trunk/content/ci.html (original)
+++ websites/staging/river/trunk/content/ci.html Sat Nov 23 20:33:38 2013
@@ -129,6 +129,7 @@ and tests the river-runtime with the riv
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -172,14 +173,15 @@ and tests the river-runtime with the riv
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/coding.html
==============================================================================
--- websites/staging/river/trunk/content/coding.html (original)
+++ websites/staging/river/trunk/content/coding.html Sat Nov 23 20:33:38 2013
@@ -100,6 +100,7 @@ intervals.</p>
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -143,14 +144,15 @@ intervals.</p>
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/concepts.html
==============================================================================
--- websites/staging/river/trunk/content/concepts.html (original)
+++ websites/staging/river/trunk/content/concepts.html Sat Nov 23 20:33:38 2013
@@ -103,6 +103,7 @@ client, registry and class-server.</p>
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -146,14 +147,15 @@ client, registry and class-server.</p>
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -200,6 +200,7 @@ The preferred place of discussion on iss
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -243,14 +244,15 @@ The preferred place of discussion on iss
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -88,6 +88,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -131,14 +132,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -96,6 +96,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -139,14 +140,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -104,6 +104,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -147,14 +148,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/documentation.html
==============================================================================
--- websites/staging/river/trunk/content/documentation.html (original)
+++ websites/staging/river/trunk/content/documentation.html Sat Nov 23 20:33:38 2013
@@ -108,6 +108,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -151,14 +152,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/downloads.html
==============================================================================
--- websites/staging/river/trunk/content/downloads.html (original)
+++ websites/staging/river/trunk/content/downloads.html Sat Nov 23 20:33:38 2013
@@ -144,6 +144,7 @@ and the 2.1.x releases made during incub
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>

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 Sat Nov 23 20:33:38 2013
@@ -89,6 +89,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -132,14 +133,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -70,7 +70,7 @@
 <p>There are currently several proposals beeing formed. </p>
 <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">&lt;</span><span class="n">T</span> <span class="n">extends</span> <span class="n">Entry</span><span class="o">&gt;</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>
+<div class="codehilite"><pre><span class="n">public</span> <span class="o">&lt;</span><span class="n">T</span> <span class="n">extends</span> <span class="n">Entry</span><span class="o">&gt;</span> <span class="n">T</span> <span class="n">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>
 
 
@@ -93,6 +93,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -136,14 +137,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -101,6 +101,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -144,14 +145,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/helloworld.html
==============================================================================
--- websites/staging/river/trunk/content/helloworld.html (original)
+++ websites/staging/river/trunk/content/helloworld.html Sat Nov 23 20:33:38 2013
@@ -194,6 +194,7 @@ ServiceStarter.main(config.riverConfig()
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -237,14 +238,15 @@ ServiceStarter.main(config.riverConfig()
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/index.html
==============================================================================
--- websites/staging/river/trunk/content/index.html (original)
+++ websites/staging/river/trunk/content/index.html Sat Nov 23 20:33:38 2013
@@ -175,6 +175,7 @@ The River graduation is currently under 
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>

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 Sat Nov 23 20:33:38 2013
@@ -120,6 +120,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -163,14 +164,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/networking.html
==============================================================================
--- websites/staging/river/trunk/content/networking.html (original)
+++ websites/staging/river/trunk/content/networking.html Sat Nov 23 20:33:38 2013
@@ -91,6 +91,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -134,14 +135,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/people.html
==============================================================================
--- websites/staging/river/trunk/content/people.html (original)
+++ websites/staging/river/trunk/content/people.html Sat Nov 23 20:33:38 2013
@@ -265,6 +265,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -308,14 +309,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/resources.html
==============================================================================
--- websites/staging/river/trunk/content/resources.html (original)
+++ websites/staging/river/trunk/content/resources.html Sat Nov 23 20:33:38 2013
@@ -91,6 +91,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -134,14 +135,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/roadmap.html
==============================================================================
--- websites/staging/river/trunk/content/roadmap.html (original)
+++ websites/staging/river/trunk/content/roadmap.html Sat Nov 23 20:33:38 2013
@@ -89,6 +89,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -132,14 +133,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/sitemap.html
==============================================================================
--- websites/staging/river/trunk/content/sitemap.html (original)
+++ websites/staging/river/trunk/content/sitemap.html Sat Nov 23 20:33:38 2013
@@ -117,6 +117,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>

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 Sat Nov 23 20:33:38 2013
@@ -71,13 +71,13 @@
 <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>
 <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>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</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>
 <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>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">river</span>
 </pre></div>
 
 
@@ -93,20 +93,20 @@
 
 <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">&gt;</span> <span class="n">your</span><span class="o">-</span><span class="n">changes</span><span class="o">.</span><span class="n">patch</span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">diff</span> <span class="o">&gt;</span> <span class="n">your</span><span class="o">-</span><span class="n">changes</span><span class="p">.</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>
 <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>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">checkout</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">river</span><span class="o">/</span><span class="n">jtsk</span><span class="o">/</span><span class="n">trunk</span> <span class="n">river</span>
 </pre></div>
 
 
 <p>To commit changes to the repository, you must set your password on the Apache Subversion server. To set your password, use ssh to connect to svn.apache.org, and enter the command <em>svnpasswd</em>. This will prompt you to enter a svn password of your choice (pick a safe password). Now, now your are ready to commit changes using your username/password. Execute the following command to commit your changes (svn will prompt you for your password)</p>
 <div class="codehilite"><pre><span class="n">svn</span> <span class="n">commit</span> <span class="o">--</span><span class="n">username</span> <span class="n">your</span><span class="o">-</span><span class="n">username</span>
-<span class="n">Authentication</span> <span class="n">realm:</span> <span class="sr">&lt;https://svn.apache.org:443&gt;</span> <span class="n">ASF</span> <span class="n">Committers</span>
+<span class="n">Authentication</span> <span class="n">realm</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span>443<span class="o">&gt;</span> <span class="n">ASF</span> <span class="n">Committers</span>
 <span class="n">Password</span> <span class="k">for</span> <span class="s">&#39;your-username&#39;</span><span class="p">:</span> <span class="n">your</span><span class="o">-</span><span class="n">password</span>
 </pre></div>
 
@@ -135,6 +135,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -178,14 +179,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -76,7 +76,7 @@
 </ol>
 </li>
 <li><a href="http://www.javaworld.com/javaworld/jw-10-2001/jw-1005-jiniinterview.html">JavaWorld</a> interview with Dr. Ted Achacoso from GroupServe</li>
-<li><a href="http://jan.newmarch.name/java/jini/tutorial/Overview.html#Success Stories">Jan Newmarch's Guide to Jini Technologies</a> contains a section on Jini successes</li>
+<li><a href="http://jan.newmarch.name/java/jini/tutorial/Overview.html#Success%20Stories">Jan Newmarch's Guide to Jini Technologies</a> contains a section on Jini successes</li>
 </ul>
 <h2 id="blitz">Blitz</h2>
 <p>To borrow from the <a href="http://www.dancres.org/blitz/">Blitz project</a> homepage: "The purpose of the  is to further the use of JavaSpaces and JINITM through the provision of essential resources"</p>
@@ -158,6 +158,7 @@ Front Office Development Manager, Sucden
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -201,14 +202,15 @@ Front Office Development Manager, Sucden
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -166,6 +166,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -209,14 +210,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

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 Sat Nov 23 20:33:38 2013
@@ -208,6 +208,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -251,14 +252,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/user-guide-basic-river-services.html
==============================================================================
--- websites/staging/river/trunk/content/user-guide-basic-river-services.html (original)
+++ websites/staging/river/trunk/content/user-guide-basic-river-services.html Sat Nov 23 20:33:38 2013
@@ -88,20 +88,20 @@
 <p>Since River uses dynamic code downloading, we need to grant various permissions to our JVM to allow that.  In the interest of simplicity, we are going to grant everything every permission.  In the real world, this would obviously not be recommended.</p>
 <p>To grant these permissions we need to create a policy file:</p>
 <div class="codehilite"><pre><span class="n">grant</span> <span class="p">{</span> 
-    <span class="n">permission</span> <span class="n">java</span><span class="o">.</span><span class="n">security</span><span class="o">.</span><span class="n">AllPermission</span><span class="p">;</span> 
+    <span class="n">permission</span> <span class="n">java</span><span class="p">.</span><span class="n">security</span><span class="p">.</span><span class="n">AllPermission</span><span class="p">;</span> 
 <span class="p">};</span>
 </pre></div>
 
 
 <p>Create the above file and save it somewhere that it can be easily referenced as a command line argument to some Java you're going to write - such as the working directory that you will run the code from.</p>
 <p>Further, your programs which will use River services will need the following JVM arguments.</p>
-<div class="codehilite"><pre><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">policy</span><span class="o">=</span><span class="n">path</span><span class="sr">/to/</span><span class="n">policy</span><span class="o">.</span><span class="n">all</span>
-<span class="o">-</span><span class="n">Djava</span><span class="o">.</span><span class="n">rmi</span><span class="o">.</span><span class="n">server</span><span class="o">.</span><span class="n">RMIClassLoaderSpi</span><span class="o">=</span><span class="n">net</span><span class="o">.</span><span class="n">jini</span><span class="o">.</span><span class="n">loader</span><span class="o">.</span><span class="n">pref</span><span class="o">.</span><span class="n">PreferredClassProvider</span>
+<div class="codehilite"><pre><span class="o">-</span><span class="n">Djava</span><span class="p">.</span><span class="n">security</span><span class="p">.</span><span class="n">policy</span><span class="p">=</span><span class="n">path</span><span class="o">/</span><span class="n">to</span><span class="o">/</span><span class="n">policy</span><span class="p">.</span><span class="n">all</span>
+<span class="o">-</span><span class="n">Djava</span><span class="p">.</span><span class="n">rmi</span><span class="p">.</span><span class="n">server</span><span class="p">.</span><span class="n">RMIClassLoaderSpi</span><span class="p">=</span><span class="n">net</span><span class="p">.</span><span class="n">jini</span><span class="p">.</span><span class="n">loader</span><span class="p">.</span><span class="n">pref</span><span class="p">.</span><span class="n">PreferredClassProvider</span>
 </pre></div>
 
 
 <p>Also, before doing anything with any River code you need to set an appropriate security manager.  This needs to be done only once per program.</p>
-<div class="codehilite"><pre><span class="n">System</span><span class="o">.</span><span class="n">setSecurityManager</span><span class="p">(</span><span class="k">new</span> <span class="n">RMISecurityManager</span><span class="p">());</span>
+<div class="codehilite"><pre><span class="n">System</span><span class="p">.</span><span class="n">setSecurityManager</span><span class="p">(</span><span class="n">new</span> <span class="n">RMISecurityManager</span><span class="p">());</span>
 </pre></div>
 
 
@@ -132,9 +132,9 @@
 <p>There are two ways to find our Lookup Service.  Remember that the interface which fulfills the role of a Lookup Service is <code>ServiceRegistrar</code>.</p>
 <h4 id="unicast">Unicast</h4>
 <p>If we know where our Lookup Service is running, we can use unicast to connect straight to it.</p>
-<div class="codehilite"><pre><span class="n">LookupLocator</span> <span class="n">ll</span> <span class="o">=</span> <span class="k">new</span> <span class="n">LookupLocator</span><span class="p">(</span><span class="s">&quot;jini://localhost:4160&quot;</span><span class="p">);</span>
-<span class="n">StreamServiceRegistrar</span> <span class="n">sr</span> <span class="o">=</span> <span class="n">ll</span><span class="o">.</span><span class="n">getStreamRegistrar</span><span class="p">();</span>
-<span class="n">System</span><span class="o">.</span><span class="n">out</span><span class="o">.</span><span class="n">println</span><span class="p">(</span><span class="s">&quot;Service Registrar: &quot;</span><span class="o">+</span><span class="n">sr</span><span class="o">.</span><span class="n">getServiceID</span><span class="p">());</span>
+<div class="codehilite"><pre><span class="n">LookupLocator</span> <span class="n">ll</span> <span class="p">=</span> <span class="n">new</span> <span class="n">LookupLocator</span><span class="p">(</span>&quot;<span class="n">jini</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>4160&quot;<span class="p">);</span>
+<span class="n">StreamServiceRegistrar</span> <span class="n">sr</span> <span class="p">=</span> <span class="n">ll</span><span class="p">.</span><span class="n">getStreamRegistrar</span><span class="p">();</span>
+<span class="n">System</span><span class="p">.</span><span class="n">out</span><span class="p">.</span><span class="n">println</span><span class="p">(</span>&quot;<span class="n">Service</span> <span class="n">Registrar</span><span class="p">:</span> &quot;<span class="o">+</span><span class="n">sr</span><span class="p">.</span><span class="n">getServiceID</span><span class="p">());</span>
 </pre></div>
 
 
@@ -142,21 +142,21 @@
 <p>The <code>LookupLocator</code> takes a String representing a "jini URL".  This jini URL is made up from the Strings "<code>jini://</code>" a hostname and (optionally) "<code>:</code>" and a port number.  4160 is the default port and is specified in the Lookup Service configuration file.  The scripts in the {{examples/hello}} directory will use the default port unless you have changed it.  See <a href="/doc/specs/html/discovery-spec.html">DJ.5.5 Address and Port Mappings for TCP and Multicast UDP</a> for more details.</p>
 <h4 id="multicast">Multicast</h4>
 <p>If we know only that "some lookup services are on the subnet somewhere" then we can use multicast to find them.</p>
-<div class="codehilite"><pre><span class="n">DiscoveryListenerManagement</span> <span class="n">dlm</span> <span class="o">=</span> <span class="k">new</span> <span class="n">LookupDiscovery</span><span class="p">(</span><span class="n">LookupDiscovery</span><span class="o">.</span><span class="n">ALL_GROUPS</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">DiscoveryListenerManagement</span> <span class="n">dlm</span> <span class="p">=</span> <span class="n">new</span> <span class="n">LookupDiscovery</span><span class="p">(</span><span class="n">LookupDiscovery</span><span class="p">.</span><span class="n">ALL_GROUPS</span><span class="p">);</span>
 
-<span class="n">LeaseRenewalManager</span> <span class="n">lrm</span> <span class="o">=</span> <span class="k">new</span> <span class="n">LeaseRenewalManager</span><span class="p">();</span>
-<span class="n">ServiceDiscoveryManager</span> <span class="n">sdm</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ServiceDiscoveryManager</span><span class="p">(</span><span class="n">dlm</span><span class="p">,</span> <span class="n">lrm</span><span class="p">);</span>
+<span class="n">LeaseRenewalManager</span> <span class="n">lrm</span> <span class="p">=</span> <span class="n">new</span> <span class="n">LeaseRenewalManager</span><span class="p">();</span>
+<span class="n">ServiceDiscoveryManager</span> <span class="n">sdm</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ServiceDiscoveryManager</span><span class="p">(</span><span class="n">dlm</span><span class="p">,</span> <span class="n">lrm</span><span class="p">);</span>
 
-<span class="n">Thread</span><span class="o">.</span><span class="nb">sleep</span><span class="p">(</span><span class="mi">500</span><span class="p">);</span> <span class="sr">//</span><span class="n">need</span> <span class="n">to</span> <span class="nb">wait</span> <span class="n">a</span> <span class="n">little</span> <span class="n">bit</span> <span class="k">for</span> <span class="n">the</span> <span class="n">Lookup</span> <span class="n">Service</span> <span class="n">to</span> <span class="n">generate</span> <span class="n">the</span> <span class="n">events</span> <span class="n">to</span> <span class="n">the</span> <span class="n">sdm</span>
+<span class="n">Thread</span><span class="p">.</span><span class="n">sleep</span><span class="p">(</span>500<span class="p">);</span> <span class="o">//</span><span class="n">need</span> <span class="n">to</span> <span class="n">wait</span> <span class="n">a</span> <span class="n">little</span> <span class="n">bit</span> <span class="k">for</span> <span class="n">the</span> <span class="n">Lookup</span> <span class="n">Service</span> <span class="n">to</span> <span class="n">generate</span> <span class="n">the</span> <span class="k">events</span> <span class="n">to</span> <span class="n">the</span> <span class="n">sdm</span>
 
-<span class="n">ServiceTemplate</span> <span class="n">srTemplate</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ServiceTemplate</span><span class="p">(</span><span class="n">null</span><span class="p">,</span> <span class="k">new</span> <span class="n">Class</span><span class="o">[]</span> <span class="p">{</span> <span class="n">ServiceRegistrar</span><span class="o">.</span><span class="n">class</span> <span class="p">},</span> <span class="n">null</span><span class="p">);</span>
+<span class="n">ServiceTemplate</span> <span class="n">srTemplate</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ServiceTemplate</span><span class="p">(</span><span class="n">null</span><span class="p">,</span> <span class="n">new</span> <span class="n">Class</span><span class="p">[]</span> <span class="p">{</span> <span class="n">ServiceRegistrar</span><span class="p">.</span><span class="n">class</span> <span class="p">},</span> <span class="n">null</span><span class="p">);</span>
 
-<span class="n">ServiceItem</span><span class="o">[]</span> <span class="n">sis</span> <span class="o">=</span> <span class="n">sdm</span><span class="o">.</span><span class="n">lookup</span><span class="p">(</span><span class="n">srTemplate</span><span class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span class="n">null</span><span class="p">);</span>
+<span class="n">ServiceItem</span><span class="p">[]</span> <span class="n">sis</span> <span class="p">=</span> <span class="n">sdm</span><span class="p">.</span><span class="n">lookup</span><span class="p">(</span><span class="n">srTemplate</span><span class="p">,</span> 10<span class="p">,</span> <span class="n">null</span><span class="p">);</span>
 <span class="k">for</span><span class="p">(</span><span class="n">ServiceItem</span> <span class="n">si</span> <span class="p">:</span> <span class="n">sis</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="n">out</span><span class="o">.</span><span class="n">println</span><span class="p">(</span><span class="s">&quot;Service Registrar: &quot;</span><span class="o">+</span><span class="n">si</span><span class="o">.</span><span class="n">serviceID</span><span class="p">);</span>
+    <span class="n">System</span><span class="p">.</span><span class="n">out</span><span class="p">.</span><span class="n">println</span><span class="p">(</span>&quot;<span class="n">Service</span> <span class="n">Registrar</span><span class="p">:</span> &quot;<span class="o">+</span><span class="n">si</span><span class="p">.</span><span class="n">serviceID</span><span class="p">);</span>
 <span class="p">}</span>
 
-<span class="n">dlm</span><span class="o">.</span><span class="n">terminate</span><span class="p">();</span>
+<span class="n">dlm</span><span class="p">.</span><span class="n">terminate</span><span class="p">();</span>
 </pre></div>
 
 
@@ -177,28 +177,28 @@ looking for. 
 As the Jini specification says, nulls and empty arrays as wildcard characters for
 "any value". 
 So the following code is a template which will match any service which implements the <code>JavaSpace</code> interface regardless of the rest of it's characteristics.</p>
-<div class="codehilite"><pre><span class="n">ServiceTemplate</span> <span class="n">template</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ServiceTemplate</span><span class="p">(</span><span class="n">null</span><span class="p">,</span> <span class="k">new</span> <span class="n">Class</span><span class="p">[)</span> <span class="p">{</span> <span class="n">JavaSpace</span><span class="o">.</span><span class="n">class</span> <span class="p">},</span> <span class="k">new</span> <span class="n">Entry</span><span class="p">[</span><span class="mi">0</span><span class="p">]());</span>
+<div class="codehilite"><pre><span class="n">ServiceTemplate</span> <span class="n">template</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ServiceTemplate</span><span class="p">(</span><span class="n">null</span><span class="p">,</span> <span class="n">new</span> <span class="n">Class</span><span class="p">[)</span> <span class="p">{</span> <span class="n">JavaSpace</span><span class="p">.</span><span class="n">class</span> <span class="p">},</span> <span class="n">new</span> <span class="n">Entry</span><span class="p">[</span>0<span class="p">]());</span>
 </pre></div>
 
 
 <p>Using the unicast and a <code>ServiceRegistrar</code> we find the Java Space like this;</p>
-<div class="codehilite"><pre><span class="n">ServiceMatches</span> <span class="n">sms</span> <span class="o">=</span> <span class="n">sr</span><span class="o">.</span><span class="n">lookup</span><span class="p">(</span><span class="n">template</span><span class="p">,</span> <span class="mi">10</span><span class="p">);</span>
-<span class="k">if</span><span class="p">(</span><span class="mi">0</span> <span class="o">&lt;</span> <span class="n">sms</span><span class="o">.</span><span class="n">items</span><span class="o">.</span><span class="nb">length</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">JavaSpace</span> <span class="n">space</span> <span class="o">=</span> <span class="p">(</span><span class="n">JavaSpace</span><span class="p">)</span> <span class="n">sms</span><span class="o">.</span><span class="n">items</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span><span class="o">.</span><span class="n">service</span><span class="p">;</span>
-    <span class="sr">//</span> <span class="k">do</span> <span class="n">something</span> <span class="n">with</span> <span class="n">the</span> <span class="n">space</span>
+<div class="codehilite"><pre><span class="n">ServiceMatches</span> <span class="n">sms</span> <span class="p">=</span> <span class="n">sr</span><span class="p">.</span><span class="n">lookup</span><span class="p">(</span><span class="n">template</span><span class="p">,</span> 10<span class="p">);</span>
+<span class="k">if</span><span class="p">(</span>0 <span class="o">&lt;</span> <span class="n">sms</span><span class="p">.</span><span class="n">items</span><span class="p">.</span><span class="nb">length</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">JavaSpace</span> <span class="n">space</span> <span class="p">=</span> <span class="p">(</span><span class="n">JavaSpace</span><span class="p">)</span> <span class="n">sms</span><span class="p">.</span><span class="n">items</span><span class="p">[</span>0<span class="p">].</span><span class="n">service</span><span class="p">;</span>
+    <span class="o">//</span> <span class="n">do</span> <span class="n">something</span> <span class="n">with</span> <span class="n">the</span> <span class="n">space</span>
 <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="n">out</span><span class="o">.</span><span class="n">println</span><span class="p">(</span><span class="s">&quot;No Java Space found.&quot;</span><span class="p">);</span>
+    <span class="n">System</span><span class="p">.</span><span class="n">out</span><span class="p">.</span><span class="n">println</span><span class="p">(</span>&quot;<span class="n">No</span> <span class="n">Java</span> <span class="n">Space</span> <span class="n">found</span><span class="p">.</span>&quot;<span class="p">);</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>Using the <code>ServiceDiscoveryManager</code> is similar;</p>
-<div class="codehilite"><pre><span class="n">ServiceItem</span> <span class="n">si</span> <span class="o">=</span> <span class="n">sdm</span><span class="o">.</span><span class="n">lookup</span><span class="p">(</span><span class="n">template</span><span class="p">,</span> <span class="n">null</span><span class="p">);</span>
-<span class="k">if</span><span class="p">(</span><span class="n">null</span> <span class="o">!=</span> <span class="n">si</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">JavaSpace</span> <span class="n">space</span> <span class="o">=</span> <span class="p">(</span><span class="n">JavaSpace</span><span class="p">)</span> <span class="n">sms</span><span class="o">.</span><span class="n">service</span><span class="p">;</span>
-    <span class="sr">//</span> <span class="k">do</span> <span class="n">something</span> <span class="n">with</span> <span class="n">the</span> <span class="n">space</span>
+<div class="codehilite"><pre><span class="n">ServiceItem</span> <span class="n">si</span> <span class="p">=</span> <span class="n">sdm</span><span class="p">.</span><span class="n">lookup</span><span class="p">(</span><span class="n">template</span><span class="p">,</span> <span class="n">null</span><span class="p">);</span>
+<span class="k">if</span><span class="p">(</span><span class="n">null</span> !<span class="p">=</span> <span class="n">si</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">JavaSpace</span> <span class="n">space</span> <span class="p">=</span> <span class="p">(</span><span class="n">JavaSpace</span><span class="p">)</span> <span class="n">sms</span><span class="p">.</span><span class="n">service</span><span class="p">;</span>
+    <span class="o">//</span> <span class="n">do</span> <span class="n">something</span> <span class="n">with</span> <span class="n">the</span> <span class="n">space</span>
 <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="n">out</span><span class="o">.</span><span class="n">println</span><span class="p">(</span><span class="s">&quot;No Java Space found.&quot;</span><span class="p">);</span>
+    <span class="n">System</span><span class="p">.</span><span class="n">out</span><span class="p">.</span><span class="n">println</span><span class="p">(</span>&quot;<span class="n">No</span> <span class="n">Java</span> <span class="n">Space</span> <span class="n">found</span><span class="p">.</span>&quot;<span class="p">);</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -213,7 +213,7 @@ So the following code is a template whic
 </ul>
 <h3 id="testing-it_3">Testing it</h3>
 <p>Testing it is done in the same way as for the Java Space.  However, the constructor of the <code>ServiceTemplate</code> changes.</p>
-<div class="codehilite"><pre><span class="n">ServiceTemplate</span> <span class="n">template</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ServiceTemplate</span><span class="p">(</span><span class="n">null</span><span class="p">,</span> <span class="k">new</span> <span class="n">Class</span><span class="p">[)</span> <span class="p">{</span> <span class="n">TransactionManager</span><span class="o">.</span><span class="n">class</span> <span class="p">},</span> <span class="k">new</span> <span class="n">Entry</span><span class="p">[</span><span class="mi">0</span><span class="p">](</span><span class="mi">0</span><span class="o">.</span><span class="n">html</span><span class="p">));</span>
+<div class="codehilite"><pre><span class="n">ServiceTemplate</span> <span class="n">template</span> <span class="p">=</span> <span class="n">new</span> <span class="n">ServiceTemplate</span><span class="p">(</span><span class="n">null</span><span class="p">,</span> <span class="n">new</span> <span class="n">Class</span><span class="p">[)</span> <span class="p">{</span> <span class="n">TransactionManager</span><span class="p">.</span><span class="n">class</span> <span class="p">},</span> <span class="n">new</span> <span class="n">Entry</span><span class="p">[</span>0<span class="p">](</span>0<span class="p">.</span><span class="n">html</span><span class="p">));</span>
 </pre></div>
           </div>
         </td>
@@ -233,6 +233,7 @@ So the following code is a template whic
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -276,14 +277,15 @@ So the following code is a template whic
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/user-guide-glossary.html
==============================================================================
--- websites/staging/river/trunk/content/user-guide-glossary.html (original)
+++ websites/staging/river/trunk/content/user-guide-glossary.html Sat Nov 23 20:33:38 2013
@@ -95,6 +95,7 @@ The formal interface of a Lookup Service
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -138,14 +139,15 @@ The formal interface of a Lookup Service
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>

Modified: websites/staging/river/trunk/content/user-guide-river-jar-artifacts.html
==============================================================================
--- websites/staging/river/trunk/content/user-guide-river-jar-artifacts.html (original)
+++ websites/staging/river/trunk/content/user-guide-river-jar-artifacts.html Sat Nov 23 20:33:38 2013
@@ -90,6 +90,7 @@
 <h3 id="apache-river">Apache river</h3>
 <ul>
 <li><a href="downloads.html">Downloads</a></li>
+<li><a href="maven-artifacts.html">Maven Artifacts</a></li>
 <li><a href="http://www.apache.org/licenses/">License</a></li>
 <li><a href="index.html">News</a></li>
 <li><a href="about.html">About</a></li>
@@ -133,14 +134,15 @@
 <li><a href="http://wiki.apache.org/river/">Wiki</a></li>
 </ul>
 <h3 id="search">Search</h3>
-<p><DIV>
+<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></p>
+</DIV>
+
 <ul>
 <li><a href="sitemap.html">Sitemap</a></li>
 </ul>



Mime
View raw message