Author: sijskes
Date: Mon Feb 14 16:54:08 2011
New Revision: 785421
Log:
Publishing merge to river site by sijskes
Modified:
websites/production/river/ (props changed)
websites/production/river/content/about.html
websites/production/river/content/building-a-release.html
websites/production/river/content/building-river.html
websites/production/river/content/ci.html
websites/production/river/content/coding.html
websites/production/river/content/concepts.html
websites/production/river/content/development-process.html
websites/production/river/content/discussion-futuredirection.html
websites/production/river/content/discussion-internet.html
websites/production/river/content/discussion-jarpackaging.html
websites/production/river/content/discussion-supportedversions.html
websites/production/river/content/documentation.html
websites/production/river/content/downloads.html
websites/production/river/content/found-a-bug.html
websites/production/river/content/generics-javaspaces.html
websites/production/river/content/get-involved.html
websites/production/river/content/index.html
websites/production/river/content/mailing-lists.html
websites/production/river/content/people.html
websites/production/river/content/resources.html
websites/production/river/content/roadmap.html
websites/production/river/content/sitemap.html
websites/production/river/content/source-code.html
websites/production/river/content/success-stories.html
websites/production/river/content/supported-platforms.html
websites/production/river/content/testing-categories.html
websites/production/river/content/user-guide-basic-river-services.html
websites/production/river/content/user-guide-glossary.html
websites/production/river/content/user-guide-river-jar-artifacts.html
websites/production/river/content/user-guide-socketfactories.html
Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 14 16:54:08 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-785415
+/websites/staging/river/trunk:778669-785420
Modified: websites/production/river/content/about.html
==============================================================================
--- websites/production/river/content/about.html (original)
+++ websites/production/river/content/about.html Mon Feb 14 16:54:08 2011
@@ -131,6 +131,7 @@ computing environments.</p>
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/building-a-release.html
==============================================================================
--- websites/production/river/content/building-a-release.html (original)
+++ websites/production/river/content/building-a-release.html Mon Feb 14
16:54:08 2011
@@ -136,6 +136,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/building-river.html
==============================================================================
--- websites/production/river/content/building-river.html (original)
+++ websites/production/river/content/building-river.html Mon Feb 14 16:54:08
2011
@@ -237,6 +237,7 @@ Currently, River should be built with JD
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/ci.html
==============================================================================
--- websites/production/river/content/ci.html (original)
+++ websites/production/river/content/ci.html Mon Feb 14 16:54:08 2011
@@ -176,6 +176,7 @@ and tests the river-runtime with the riv
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/coding.html
==============================================================================
--- websites/production/river/content/coding.html (original)
+++ websites/production/river/content/coding.html Mon Feb 14 16:54:08 2011
@@ -135,6 +135,7 @@ intervals.</p>
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/concepts.html
==============================================================================
--- websites/production/river/content/concepts.html (original)
+++ websites/production/river/content/concepts.html Mon Feb 14 16:54:08 2011
@@ -138,6 +138,7 @@ client, registry and class-server.</p>
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/development-process.html
==============================================================================
--- websites/production/river/content/development-process.html (original)
+++ websites/production/river/content/development-process.html Mon Feb 14
16:54:08 2011
@@ -235,6 +235,7 @@ The preferred place of discussion on iss
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/discussion-futuredirection.html
==============================================================================
--- websites/production/river/content/discussion-futuredirection.html (original)
+++ websites/production/river/content/discussion-futuredirection.html Mon Feb
14 16:54:08 2011
@@ -123,6 +123,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/discussion-internet.html
==============================================================================
--- websites/production/river/content/discussion-internet.html (original)
+++ websites/production/river/content/discussion-internet.html Mon Feb 14
16:54:08 2011
@@ -121,6 +121,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/discussion-jarpackaging.html
==============================================================================
--- websites/production/river/content/discussion-jarpackaging.html (original)
+++ websites/production/river/content/discussion-jarpackaging.html Mon Feb 14
16:54:08 2011
@@ -139,6 +139,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/discussion-supportedversions.html
==============================================================================
--- websites/production/river/content/discussion-supportedversions.html
(original)
+++ websites/production/river/content/discussion-supportedversions.html Mon Feb
14 16:54:08 2011
@@ -68,7 +68,7 @@
<div class="wiki-content">
<h1 id="status_quo">Status Quo</h1>
<p>Currently river is build with a Oracle JDK 6,
-with source level '5' and target level 'jsr14'.</p>
+with source level '5' and target level '5'.</p>
<p>The compilation needs a JDK6 com.sun package.</p>
<h1 id="future_directions">Future directions</h1>
<p>Discussions are underway on the river-dev mailinglist to determine the
support of the different Java versions.
@@ -157,6 +157,7 @@ The requirements collected until now are
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/documentation.html
==============================================================================
--- websites/production/river/content/documentation.html (original)
+++ websites/production/river/content/documentation.html Mon Feb 14 16:54:08
2011
@@ -143,6 +143,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/downloads.html
==============================================================================
--- websites/production/river/content/downloads.html (original)
+++ websites/production/river/content/downloads.html Mon Feb 14 16:54:08 2011
@@ -158,6 +158,7 @@ Older releases, when available, can be o
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/found-a-bug.html
==============================================================================
--- websites/production/river/content/found-a-bug.html (original)
+++ websites/production/river/content/found-a-bug.html Mon Feb 14 16:54:08 2011
@@ -124,6 +124,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/generics-javaspaces.html
==============================================================================
--- websites/production/river/content/generics-javaspaces.html (original)
+++ websites/production/river/content/generics-javaspaces.html Mon Feb 14
16:54:08 2011
@@ -128,6 +128,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/get-involved.html
==============================================================================
--- websites/production/river/content/get-involved.html (original)
+++ websites/production/river/content/get-involved.html Mon Feb 14 16:54:08 2011
@@ -136,6 +136,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/index.html
==============================================================================
--- websites/production/river/content/index.html (original)
+++ websites/production/river/content/index.html Mon Feb 14 16:54:08 2011
@@ -176,6 +176,7 @@ The River graduation is currently under
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/mailing-lists.html
==============================================================================
--- websites/production/river/content/mailing-lists.html (original)
+++ websites/production/river/content/mailing-lists.html Mon Feb 14 16:54:08
2011
@@ -155,6 +155,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/people.html
==============================================================================
--- websites/production/river/content/people.html (original)
+++ websites/production/river/content/people.html Mon Feb 14 16:54:08 2011
@@ -294,6 +294,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/resources.html
==============================================================================
--- websites/production/river/content/resources.html (original)
+++ websites/production/river/content/resources.html Mon Feb 14 16:54:08 2011
@@ -126,6 +126,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/roadmap.html
==============================================================================
--- websites/production/river/content/roadmap.html (original)
+++ websites/production/river/content/roadmap.html Mon Feb 14 16:54:08 2011
@@ -124,6 +124,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/sitemap.html
==============================================================================
--- websites/production/river/content/sitemap.html (original)
+++ websites/production/river/content/sitemap.html Mon Feb 14 16:54:08 2011
@@ -150,6 +150,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/source-code.html
==============================================================================
--- websites/production/river/content/source-code.html (original)
+++ websites/production/river/content/source-code.html Mon Feb 14 16:54:08 2011
@@ -170,6 +170,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/success-stories.html
==============================================================================
--- websites/production/river/content/success-stories.html (original)
+++ websites/production/river/content/success-stories.html Mon Feb 14 16:54:08
2011
@@ -195,6 +195,7 @@ Front Office Development Manager, Sucden
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/supported-platforms.html
==============================================================================
--- websites/production/river/content/supported-platforms.html (original)
+++ websites/production/river/content/supported-platforms.html Mon Feb 14
16:54:08 2011
@@ -123,10 +123,10 @@
</table>
<p>Notes:</p>
<ul>
-<li>JERI KerberosServerEndpoint uses sun.com.* api</li>
-<li>Phoenix implementation uses sun.com.* api</li>
+<li>JERI KerberosServerEndpoint uses com.sun.* api</li>
+<li>Phoenix implementation uses com.sun.* api</li>
</ul>
-<p>The sun.com.* packages are only available on Sun/Oracle based JDK's</p>
+<p>The com.sun.* packages are only available on Sun/Oracle based JDK's</p>
<h2 id="authentication_subsystems">Authentication subsystems</h2>
<table>
<thead>
@@ -199,6 +199,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/testing-categories.html
==============================================================================
--- websites/production/river/content/testing-categories.html (original)
+++ websites/production/river/content/testing-categories.html Mon Feb 14
16:54:08 2011
@@ -243,6 +243,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
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 Mon
Feb 14 16:54:08 2011
@@ -263,6 +263,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/user-guide-glossary.html
==============================================================================
--- websites/production/river/content/user-guide-glossary.html (original)
+++ websites/production/river/content/user-guide-glossary.html Mon Feb 14
16:54:08 2011
@@ -130,6 +130,7 @@ The formal interface of a Lookup Service
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/user-guide-river-jar-artifacts.html
==============================================================================
--- websites/production/river/content/user-guide-river-jar-artifacts.html
(original)
+++ websites/production/river/content/user-guide-river-jar-artifacts.html Mon
Feb 14 16:54:08 2011
@@ -125,6 +125,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
Modified: websites/production/river/content/user-guide-socketfactories.html
==============================================================================
--- websites/production/river/content/user-guide-socketfactories.html (original)
+++ websites/production/river/content/user-guide-socketfactories.html Mon Feb
14 16:54:08 2011
@@ -121,6 +121,7 @@
<ul>
<li><a href="source-code.html">Source Code</a></li>
<li><a href="building-river.html">Building River</a></li>
+<li><a href="ci.html">Continuous Integration</a></li>
<li><a href="roadmap.html">Roadmap</a></li>
<li><a href="development-process.html">Development Process</a></li>
<li><a href="https://issues.apache.org/jira/browse/RIVER";>Issue
Tracker</a></li>
