You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2011/02/11 21:16:12 UTC

svn commit: r785319 - in /websites/production/river: ./ content/mailing-lists.html content/source-code.html content/user-guide-basic-river-services.html

Author: sijskes
Date: Fri Feb 11 20:16:12 2011
New Revision: 785319

Log:
Publishing merge to river site by sijskes

Modified:
    websites/production/river/   (props changed)
    websites/production/river/content/mailing-lists.html
    websites/production/river/content/source-code.html
    websites/production/river/content/user-guide-basic-river-services.html

Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 11 20:16:12 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-785305
+/websites/staging/river/trunk:778669-785318

Modified: websites/production/river/content/mailing-lists.html
==============================================================================
--- websites/production/river/content/mailing-lists.html (original)
+++ websites/production/river/content/mailing-lists.html Fri Feb 11 20:16:12 2011
@@ -81,24 +81,24 @@
 <tbody>
 <tr>
 <td>River Developer List</td>
-<td><a href="mailto:river-dev-subscribe@incubator.apache.org">river-dev-subscribe</a></td>
-<td><a href="mailto:river-dev-unsubscribe@incubator.apache.org">river-dev-unsubscribe</a></td>
-<td><a href="mailto:river-dev@incubator.apache.org">river-dev</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/incubator-river-dev/">mail-archives.apache.org</a></td>
+<td><a href="mailto:dev-subscribe@river.apache.org">dev-subscribe</a></td>
+<td><a href="mailto:dev-unsubscribe@river.apache.org">dev-unsubscribe</a></td>
+<td><a href="mailto:dev@river.apache.org">dev</a></td>
+<td><a href="http://mail-archives.apache.org/mod_mbox/river-dev/">mail-archives.apache.org</a></td>
 </tr>
 <tr>
 <td>River User List</td>
-<td><a href="mailto:river-user-subscribe@incubator.apache.org">river-user-subscribe</a></td>
-<td><a href="mailto:river-user-unsubscribe@incubator.apache.org">river-user-unsubscribe</a></td>
-<td><a href="mailto:river-user@incubator.apache.org">river-user</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/incubator-river-user/">mail-archives.apache.org</a></td>
+<td><a href="mailto:user-subscribe@river.apache.org">user-subscribe</a></td>
+<td><a href="mailto:user-unsubscribe@river.apache.org">user-unsubscribe</a></td>
+<td><a href="mailto:user@river.apache.org">user</a></td>
+<td><a href="http://mail-archives.apache.org/mod_mbox/river-user/">mail-archives.apache.org</a></td>
 </tr>
 <tr>
 <td>River Commits List</td>
-<td><a href="mailto:river-commits-subscribe@incubator.apache.org">river-commits-subscribe</a></td>
-<td><a href="mailto:river-commits-unsubscribe@incubator.apache.org">river-commits-unsubscribe</a></td>
-<td><a href="mailto:river-commits@incubator.apache.org">river-commits</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/incubator-river-commits/">mail-archives.apache.org</a></td>
+<td><a href="mailto:commits-subscribe@river.apache.org">commits-subscribe</a></td>
+<td><a href="mailto:commits-unsubscribe@river.apache.org">commits-unsubscribe</a></td>
+<td><a href="mailto:commits@river.apache.org">commits</a></td>
+<td><a href="http://mail-archives.apache.org/mod_mbox/river-commits/">mail-archives.apache.org</a></td>
 </tr>
 </tbody>
 </table>

Modified: websites/production/river/content/source-code.html
==============================================================================
--- websites/production/river/content/source-code.html (original)
+++ websites/production/river/content/source-code.html Fri Feb 11 20:16:12 2011
@@ -68,7 +68,7 @@
           <div class="wiki-content">
 <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/incubator/river/">http://svn.apache.org/viewvc/incubator/river/</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>
 <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>

Modified: websites/production/river/content/user-guide-basic-river-services.html
==============================================================================
--- websites/production/river/content/user-guide-basic-river-services.html (original)
+++ websites/production/river/content/user-guide-basic-river-services.html Fri Feb 11 20:16:12 2011
@@ -139,7 +139,7 @@
 
 
 <p>Assuming you don't get a <code>NullPointerException</code> and you do get a service ID written out, then your Lookup Service is running fine.</p>
-<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="http://incubator.apache.org/river/doc/specs/html/discovery-spec.html">DJ.5.5 Address and Port Mappings for TCP and Multicast UDP</a> for more details.</p>
+<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>