Added: river/site/trunk/content/js/prettify.js
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/js/prettify.js?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/js/prettify.js (added)
+++ river/site/trunk/content/js/prettify.js Thu Dec 22 17:17:48 2016
@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return 
f;var 
b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function
 
e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return
 a}function h(a){for(var 
f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var 
j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var 
j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return
 
a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return
 b.join("")}function y(a){for(var 
f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var
 
j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void
 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return
 f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var 
g=a[p];if(g.ignoreCase)l=!0;else 
if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var
 r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw
 Error(""+g);n.push("(?:"+y(g)+")")}return 
RegExp(n.join("|"),l?"gi":"g")}function M(a){function 
m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var 
g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case
 3:case 
4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r 
]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var 
e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var
 
p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function
 B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function 
e(a){for(var 
l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var 
f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var 
i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof
 o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var 
j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else
 p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var 
k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var
 t=m.length;return e}function u(a){var 
m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var
 
h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^
 | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q,"
 
\r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return
 x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 
1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else 
for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var 
b=a.nodeValue,d=b.match(t);if(d){var 
c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function
 h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var 
f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var 
h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var 
a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var 
k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var
 
p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var
 d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var 
n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function
 k(a,m){for(var e=m.length;--e>=0;){var 
h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override 
language handler %s",h):A[h]=a}}function 
C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return
 A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var 
k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var
 
r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var
 
z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var
 
o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var 
x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in
 window&&console.log(w&&w.stack?w.stack:w)}}var 
v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q,"
 
\t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var
 
h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return 
h.innerHTML};window.prettyPrint=function(a){function m(){for(var 
e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var
 n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var 
i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 
0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var 
e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var
 t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var 
e=q,l=Date;l.now||(l={now:function(){return+new Date}});var 
p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();

Added: river/site/trunk/content/license-notice.mdtext
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/license-notice.mdtext?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/license-notice.mdtext (added)
+++ river/site/trunk/content/license-notice.mdtext Thu Dec 22 17:17:48 2016
@@ -0,0 +1,16 @@
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
\ No newline at end of file

Added: river/site/trunk/content/user-doc/cookbook.mdtext
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/cookbook.mdtext?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/user-doc/cookbook.mdtext (added)
+++ river/site/trunk/content/user-doc/cookbook.mdtext Thu Dec 22 17:17:48 2016
@@ -0,0 +1,24 @@
+Title: Cookbook
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+### Using a SocketFactory with a TcpEndpoint
+
+The SocketFactory needs to be Serializable. Make sure the hashcode of the 
SocketFactory stays the same during
+de-serialization. Otherwise you end up with multiple connections, and a lot of 
threads on the serverside. This
+is caused by the use of the hashcode of the SocketFactory in the hashcode of 
the endpoint. When it is not stable,
+seemingly equal endpoints do not get interned as the same endpoint.
\ No newline at end of file

Copied: river/site/trunk/content/user-doc/found-a-bug.mdtext (from r1775683, 
river/site/trunk/content/found-a-bug.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/found-a-bug.mdtext?p2=river/site/trunk/content/user-doc/found-a-bug.mdtext&p1=river/site/trunk/content/found-a-bug.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/found-a-bug.mdtext (original)
+++ river/site/trunk/content/user-doc/found-a-bug.mdtext Thu Dec 22 17:17:48 
2016
@@ -1,14 +1,39 @@
 Title: Found a Bug
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+### Found a Bug?
+
+
+If you think you've found a problem with Apache River you can search JIRA, our 
issue-tracking system, to see if the
+problem has already been noted (visit 
[JIRA](http://issues.apache.org/jira/browse/RIVER)). If the issue is not listed
+there, you can add a new JIRA issue describing it, please include detailed 
steps to reproduce the problem. Often it
+is best to raise an issue not yet listed in JIRA first on the River Developer 
mailing list (see
+[Mailing Lists](mailing-lists.html)) before adding it directly in JIRA.
+
+If you have a fix for the issue, you can generate a patch file to send the fix 
to us. You need to check out the
+current source code from Subversion, make the necessary changes, and then do a 
full build. And, of course, confirm
+that the problem is actually fixed. Then, go to the base directory of your 
RIVER checkout, and to generate a patch file
+run a command like:
 
+`svn diff > fix-for-my-bug.patch`
 
 
-# Found a Bug?
-
-
-If you think you've found a problem with Apache River you can search JIRA, our 
issue-tracking system, to see if the problem has already been noted (visit 
[JIRA](http://issues.apache.org/jira/browse/RIVER)). If the issue is not listed 
there, you can add a new JIRA issue describing it, please include detailed 
steps to reproduce the problem. Often it is best to raise an issue not yet 
listed in JIRA first on the River Developer mailing list (see [Mailing 
Lists](mailing-lists.html)) before adding it directly in JIRA.
-
-If you have a fix for the issue, you can generate a patch file to send the fix 
to us. You need to check out the current source code from Subversion, make the 
necessary changes, and then do a full build. And, of course, confirm that the 
problem is actually fixed. Then, go to the base directory of your RIVER 
checkout, and run a command like `svn diff > fix-for-my-bug.patch` to generate 
a patch file.
-
-To submit a patch, create an issue in JIRA that describes the problem, and add 
your patch file as an attachment. Please include detailed steps to reproduce 
the problem in the issue description, and a test case in the patch where 
possible.
+To submit a patch, create an issue in JIRA that describes the problem, and add 
your patch file as an attachment.
+Please include detailed steps to reproduce the problem in the issue 
description, and a test case in the patch where possible.
 
 Thanks for interest, and working with us to improve Apache River!

Copied: river/site/trunk/content/user-doc/get-involved.mdtext (from r1775683, 
river/site/trunk/content/get-involved.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/get-involved.mdtext?p2=river/site/trunk/content/user-doc/get-involved.mdtext&p1=river/site/trunk/content/get-involved.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/get-involved.mdtext (original)
+++ river/site/trunk/content/user-doc/get-involved.mdtext Thu Dec 22 17:17:48 
2016
@@ -1,13 +1,27 @@
 Title: Get Involved
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
 
-
-
-# Join the Apache River Community
-
+## Join the Apache River Community
 
 The Apache River project is being built by the open source community for the 
open source community. We truly welcome your input and contributions!
 
-## What we are looking for:
+<div class="space-mn"></div>
+### What we are looking for:
 
 
  * Bug fixes and code enhancement contributions
@@ -16,10 +30,14 @@ The Apache River project is being built
  * Feature suggestions
  * Detailed and constructive feedback
  * Articles and whitepapers
+ * Web site improvements
 
-## How do I Contribute?
 
+<div class="space-mn"></div>
+### How do I contribute?
 
  * To discuss Apache River topics check out the [mailing 
lists](mailing-lists.html).
  * Bugs and other issues can be posted in the 
[RIVER](http://issues.apache.org/jira/browse/RIVER) issue tracker.
+ See more info [here](found-a-bug.html).
  * The [River wiki](http://wiki.apache.org/river/) is open for anyone to 
contribute related documentation.
+ * [Learn](website.html) how to deal with Web site related issues

Copied: river/site/trunk/content/user-doc/getting-started.mdtext (from 
r1766308, river/site/trunk/content/user-guide-basic-river-services.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/getting-started.mdtext?p2=river/site/trunk/content/user-doc/getting-started.mdtext&p1=river/site/trunk/content/user-guide-basic-river-services.mdtext&r1=1766308&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/user-guide-basic-river-services.mdtext (original)
+++ river/site/trunk/content/user-doc/getting-started.mdtext Thu Dec 22 
17:17:48 2016
@@ -1,29 +1,59 @@
-Title: User Guide - Basic River Services
+Title: Getting Started With River
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+### Getting Started With River
+
+This document is going to explain how you can use the in-built "simple" 
services that come with River.  More specifically:
+
+  - a Lookup Service, the "reggie" implementation
+  - a JavaSpace, the "outrigger" implementation
+  - a Transaction Service, the "mahalo" implementation
+
+The instructions assume that you're building from source as checked out from 
the SVN trunk.  Currently this is
+necessary because the code snippets below use methods and classes which, at 
time of writing, haven't made it into
+the latest binary release yet.  Having said that, the code you will need in 
the binary release isn't to far removed
+from what you'll see below, so you can progress with the binary release if you 
want to and are happy odifying the code.
+
+If you are going to use the latest release then you will still need to 
download (from the SVN trunk) some of the
+Windows BAT files mentioned below.  *nix sh scripts of those same batch files 
will appear shortly.
+
+####
+<div class="panel panel-default">
+<div class="panel-heading">Environment Setup</div>
+  <div class="panel-body">
+
+The following instructions all assume that you have checked out River to some 
directory which is throughout referred
+to as `$RIVER_HOME`.  Further, you have changed directory into 
`$RIVER_HOME/examples/hello`.
+
+<div class="alert alert-info">
+  Run all scripts from the `hello` directory
+</div>
 
-# Getting Started With River
-
-This document is going to explain how you can use the inbuilt "simple" 
services that come with River.  More specifically;
-
-  - A Lookup Service (the "reggie" implementation)
-  - A Java Space (the "outrigger" implementation)
-  - A Transaction Service (the "mahalo" implementation)
-
-The instructions assume that you're building from source as checked out from 
the SVN trunk.  Currently this is necessary because the code snippets below use 
methods and classes which, at time of writing, haven't made it into the latest 
binary release yet.  Having said that, the code you will need in the binary 
release isn't to far removed from what you'll see below, so you can progress 
with the binary release if you want to and are happy odifying the code.
-
-If you are going to use the latest release then you will still need to 
download (from the SVN trunk) some of the Windows BAT files mentioned below.  
*nix sh scripts of those same batch files will appear shortly.
-
-## Environment Setup
-
-The following instructions all assume that you have checked out River to some 
directory which is throughout referred to as `$RIVER_HOME`.  Further, you have 
changed directory into `$RIVER_HOME/examples/hello`.
-
->**Important**: Run all scripts from the `hello` directory
 
   - Change directory to $RIVER_HOME
   - Use Ant to build River, i.e. `ant all.build`
 
-## Running Code Which Uses River Services
+####
+#### Running Code Which Uses River Services
 
-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.
+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.
 
 To grant these permissions we need to create a policy file:
 
@@ -31,7 +61,8 @@ To grant these permissions we need to cr
        permission java.security.AllPermission; 
     }; 
 
-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.
+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.
 
 Further, your programs which will use River services will need the following 
JVM arguments.
 
@@ -39,59 +70,88 @@ Further, your programs which will use Ri
     
-Djava.rmi.server.RMIClassLoaderSpi=net.jini.loader.pref.PreferredClassProvider
 
 
-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.
+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.
 
     System.setSecurityManager(new RMISecurityManager());
+  </div>
+</div>
 
-## Starting the HTTP server
 
-### What?  Wait, why do I need to do that?
 
-When services get marshalled for sending over the wire, the first part of 
their stream is the codebase URL.  This URL tells the downloading JVM where to 
load the supporting JARs from.  Often (although not always) in the River/Jini 
world this code base harks back to some HTTP server.  There is a simple HTPP 
server packaged inside River which can be used for this.  That's what we're 
going to start.
+####
+<div class="panel panel-default">
+<div class="panel-heading">Starting the HTTP server</div>
+  <div class="panel-body">
 
-See [3.2 How codebase is used in Java 
RMI](http://download.oracle.com/javase/1.5.0/docs/guide/rmi/codebase.html) for 
more details.
+#### What?  Wait, why do I need to do that?
 
-### Instructions
+When services get marshalled for sending over the wire, the first part of 
their stream is the codebase URL.  This URL
+tells the downloading JVM where to load the supporting JARs from.  Often 
(although not always) in the River/Jini world
+this code base harks back to some HTTP server.  There is a simple HTPP server 
packaged inside River which can be used
+for this.  That's what we're going to start.
 
- - Change to directory to `$RIVER_HOME/examples/hello/`
- - Execute the script; `scripts/httpd.bat`
+See [3.2 How codebase is used in Java 
RMI](http://download.oracle.com/javase/1.5.0/docs/guide/rmi/codebase.html) for
+more details.
 
-### Testing it
+<div class="alert alert-info">
+  - Change to directory to `$RIVER_HOME/examples/hello/` <br/>
+  - Execute the script; `scripts/httpd.bat` <br/>
+</div>
+
+#### Testing it
 
 To test that the HTTP server is running correctly use wget or your web browser 
on the following URL
 
  - http://localhost:8080/reggie-dl.jar
+  </div>
+</div>
+
 
-## Starting a Service Registrar (Lookup Service)
 
-### What?  Wait, why do I need to do that?
+####
+<div class="panel panel-default">
+<div class="panel-heading">Starting a Service Registrar (Lookup Service)</div>
+  <div class="panel-body">
 
-Typically, in an environment which uses River/Jini services, a Lookup Service 
will be used.  This Lookup Service is then used by your code to find River/Jini 
services.  Lookup Services always know the current state of the subnet or 
federated space.
+##### What?  Wait, why do I need to do that?
+
+Typically, in an environment which uses River/Jini services, a Lookup Service 
will be used.  This Lookup Service is
+then used by your code to find River/Jini services.  Lookup Services always 
know the current state of the subnet or
+federated space.
 
 Broadly speaking (although not 100% accurately) you need a Lookup Service in 
order to be able to find other services to use.
 
-## Instructions
+<div class="alert alert-info">
+  - Change to directory to `$RIVER_HOME/examples/hello/` <br/>
+  - Execute the script; `scripts/jrmp-reggie.bat` <br/>
+</div>
 
- - Change directory to `$RIVER_HOME/examples/hello`
- - Execute the script `scripts/jrmp-reggie.bat`
 
-### Testing it
+##### Testing it
 
-There are two ways to find our Lookup Service.  Remember that the interface 
which fulfills the role of a Lookup Service is `ServiceRegistrar`.
+There are two ways to find our Lookup Service.  Remember that the interface 
which fulfills the role of a Lookup Service
+ is `ServiceRegistrar`.
 
-#### Unicast
+##### Unicast
 
 If we know where our Lookup Service is running, we can use unicast to connect 
straight to it.
 
+    :::java
     LookupLocator ll = new LookupLocator("jini://localhost:4160");
     StreamServiceRegistrar sr = ll.getStreamRegistrar();
-    System.out.println("Service Registrar: "+sr.getServiceID());
+    System.out.println("Service Registrar: " + sr.getServiceID());
 
-Assuming you don't get a `NullPointerException` and you do get a service ID 
written out, then your Lookup Service is running fine.
+Assuming you don't get a `NullPointerException` and you do get a service ID 
written out, then your Lookup Service is
+running fine.
 
-The `LookupLocator` takes a String representing a "jini URL".  This jini URL 
is made up from the Strings "`jini://`" a hostname and (optionally) "`:`" 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 [DJ.5.5 Address and Port 
Mappings for TCP and Multicast UDP](/doc/specs/html/discovery-spec.html) for 
more details.
+The `LookupLocator` takes a String representing a "jini URL".  This jini URL 
is made up from the Strings "`jini://`" a
+ hostname and (optionally) "`:`" 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 [DJ.5.5 Address and Port Mappings for TCP and Multicast 
UDP](/release-doc/2.2.3/specs/html/discovery-spec.html)
+ for more details.
 
-#### Multicast
+##### Multicast
 
 If we know only that "some lookup services are on the subnet somewhere" then 
we can use multicast to find them.
 
@@ -105,28 +165,39 @@ If we know only that "some lookup servic
     ServiceTemplate srTemplate = new ServiceTemplate(null, new Class[] { 
ServiceRegistrar.class }, null);
     
     ServiceItem[] sis = sdm.lookup(srTemplate, 10, null);
-    for(ServiceItem si : sis) {
+    for (ServiceItem si : sis) {
         System.out.println("Service Registrar: "+si.serviceID);
     }
     
     dlm.terminate();
 
-This approach is slightly different.  It is relying the 
`ServiceDiscoveryManager` to listen to the UDP multicast packets announcing the 
presence of a Lookup Service.  The same rules apply as for unicast on deciding 
whether or not your Lookup Service is running.
+This approach is slightly different.  It is relying the 
`ServiceDiscoveryManager` to listen to the UDP multicast
+packets announcing the presence of a Lookup Service.  The same rules apply as 
for unicast on deciding whether or
+not your Lookup Service is running.
 
-This approach can be modified if you know which hosts on the subnet _might_ be 
running lookup services.  You can define and pass this list to the 
`LookupDiscovery` constructor.
+This approach can be modified if you know which hosts on the subnet _might_ be 
running lookup services.  You can
+define and pass this list to the `LookupDiscovery` constructor.
+</div>
+</div>
 
-## Starting a Java Space
 
-### What?  Wait, why do I need to do that?
+####
+<div class="panel panel-default">
+<div class="panel-heading">Starting a Java Space</div>
+  <div class="panel-body">
 
-Finding a Lookup Service is only useful if there are some other services on 
the network which you want to use, so now we're going to start a Java Space, 
and find that.  Using the Java Space is outside the scope of this document, 
although the "how" is relativily straight forward.
+##### What?  Wait, why do I need to do that?
 
-### Instructions
+Finding a Lookup Service is only useful if there are some other services on 
the network which you want to use, so
+now we're going to start a Java Space, and find that.  Using the Java Space is 
outside the scope of this document,
+although the "how" is relatively straightforward.
 
- - Change directory to `$RIVER_HOME/examples/hello`
- - Execute the script `scripts/jrmp-outrigger-group.bat`
+<div class="alert alert-info">
+  - Change to directory to `$RIVER_HOME/examples/hello/` <br/>
+  - Execute the script; `scripts/jrmp-outrigger-group` <br/>
+</div>
 
-### Testing it
+##### Testing it
 
 To find any kind of service we must first create a template. 
 This is an instance of `ServiceTemplate` which describes the kind of thing 
we're 
@@ -140,38 +211,46 @@ So the following code is a template whic
 Using the unicast and a `ServiceRegistrar` we find the Java Space like this;
     
     ServiceMatches sms = sr.lookup(template, 10);
-    if(0 < sms.items.length) {
+    if (0 < sms.items.length) {
         JavaSpace space = (JavaSpace) sms.items[0].service;
         // do something with the space
-    } else {
+    }
+    else {
         System.out.println("No Java Space found.");
     }
 
 Using the `ServiceDiscoveryManager` is similar;
 
     ServiceItem si = sdm.lookup(template, null);
-    if(null != si) {
+    if (null != si) {
         JavaSpace space = (JavaSpace) sms.service;
         // do something with the space
-    } else {
+    }
+    else {
         System.out.println("No Java Space found.");
     }
+</div>
+</div>
 
-## Starting a Transaction Service
 
+####
+<div class="panel panel-default">
+<div class="panel-heading">Starting a Transaction Service</div>
+  <div class="panel-body">
 
-### What?  Wait, why do I need to do that?
+##### What?  Wait, why do I need to do that?
 
 Because you'd like to find something that will give you a nice distributed 
transaction.
 
-### Instructions
-
- - Change directory to `$RIVER_HOME/examples/hello`
- - Execute the script `scripts/jrmp-mahalo-group.bat`
+<div class="alert alert-info">
+  - Change to directory to `$RIVER_HOME/examples/hello/` <br/>
+  - Execute the script; `scripts/jrmp-mahalo-group` <br/>
+</div>
 
-### Testing it
+##### Testing it
 
 Testing it is done in the same way as for the Java Space.  However, the 
constructor of the `ServiceTemplate` changes.
 
     ServiceTemplate template = new ServiceTemplate(null, new Class[) { 
TransactionManager.class }, new Entry[0](0.html));
-
+</div>
+</div>
\ No newline at end of file

Copied: river/site/trunk/content/user-doc/glossary.mdtext (from r1766308, 
river/site/trunk/content/user-guide-glossary.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/glossary.mdtext?p2=river/site/trunk/content/user-doc/glossary.mdtext&p1=river/site/trunk/content/user-guide-glossary.mdtext&r1=1766308&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/user-guide-glossary.mdtext (original)
+++ river/site/trunk/content/user-doc/glossary.mdtext Thu Dec 22 17:17:48 2016
@@ -1,12 +1,29 @@
-Title: User Guide - Glossary
+Title: Glossary
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
 
-# User Guide - Glossary
 
-  - 4161<br/>
-This is the default Jini port which Lookup Service use
-  - Lookup Service<br/>
+### Glossary
+
+  - **4161**<br/>
+This is the default Jini port which Lookup Service uses
+  - **Lookup Service**<br/>
 A type of service which knows, at all times, what other services are available 
in the sub-net or in the federated space
-  - Reggie<br/>
+  - **Reggie**<br/>
 The name of the default implementation of a Lookup Service
-  - Service Registrar<br/>
+  - **Service Registrar**<br/>
 The formal interface of a Lookup Service; 
`net.jini.core.lookup.ServiceRegistrar`
\ No newline at end of file

Copied: river/site/trunk/content/user-doc/mailing-lists.mdtext (from r1767231, 
ace/site/trunk/content/get-involved/mailing-lists.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/mailing-lists.mdtext?p2=river/site/trunk/content/user-doc/mailing-lists.mdtext&p1=ace/site/trunk/content/get-involved/mailing-lists.mdtext&r1=1767231&r2=1775684&rev=1775684&view=diff
==============================================================================
--- ace/site/trunk/content/get-involved/mailing-lists.mdtext (original)
+++ river/site/trunk/content/user-doc/mailing-lists.mdtext Thu Dec 22 17:17:48 
2016
@@ -1,27 +1,52 @@
 Title: Mailing Lists
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
 
-## [email protected]
 
-This list is for people using Apache ACE. Please note that during incubation, 
we only had a developer list, which means that you might want to search the 
archives of the developer list below as well, when searching for answers.
+### Mailing Lists
 
-* [subscribe](mailto:[email protected])
-* [unsubscribe](mailto:[email protected])
-* [archive](http://mail-archives.apache.org/mod_mbox/ace-users/)
+<div class="space-mn"></div>
+#### [email protected]
 
-## [email protected]
+This list is for people using Apache ACE. Please note that during incubation, 
we only had a developer list, which means
+that you might want to search the archives of the developer list below as 
well, when searching for answers.
 
-This list is for people interested in participating in developing Apache ACE 
further.
+* [subscribe](mailto:[email protected])
+* [unsubscribe](mailto:[email protected])
+* [archive](http://mail-archives.apache.org/mod_mbox/river-user/)
 
-* [subscribe](mailto:[email protected])
-* [unsubscribe](mailto:[email protected])
-* [archive](http://mail-archives.apache.org/mod_mbox/ace-dev/)
+#### [email protected]
 
-## [email protected]
+This list is for people interested in participating in developing Apache River 
further.
 
-This list contains all changes within the project. This includes code changes 
(svn commits), documentation changes (site and wiki updates) and issues that 
have been reported or closed.
+* [subscribe](mailto:[email protected])
+* [unsubscribe](mailto:[email protected])
+* [archive](http://mail-archives.apache.org/mod_mbox/river-dev/)
 
-* [subscribe](mailto:[email protected])
-* [unsubscribe](mailto:[email protected])
-* [archive](http://mail-archives.apache.org/mod_mbox/ace-commits/)
+#### [email protected]
 
+This list contains all changes within the project. This includes code changes 
(svn commits), documentation changes
+(site and wiki updates) and issues that have been reported or closed.
 
+* [subscribe](mailto:[email protected])
+* [unsubscribe](mailto:[email protected])
+* [archive](http://mail-archives.apache.org/mod_mbox/river-commits/)
+
+
+#### Pre-Apache mailing list
+
+Content of the pre-Apache mailing list can be read 
[here](http://osdir.com/ml/java.sun.jini/).
\ No newline at end of file

Copied: river/site/trunk/content/user-doc/maven-artifacts.mdtext (from 
r1775683, river/site/trunk/content/maven-artifacts.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/maven-artifacts.mdtext?p2=river/site/trunk/content/user-doc/maven-artifacts.mdtext&p1=river/site/trunk/content/maven-artifacts.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/maven-artifacts.mdtext (original)
+++ river/site/trunk/content/user-doc/maven-artifacts.mdtext Thu Dec 22 
17:17:48 2016
@@ -1,4 +1,4 @@
-Title:
+Title: Maven Artifacts
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information
@@ -16,60 +16,48 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Maven Artifacts for Apache River
 
-Cut/paste oriented people might want to have a look at the bottom of the 
page...
-
-
-The River project artifacts are uploaded to Maven Central under the following
-coordinates (use the desired version, e.g. 2.2.2):
-
-net.jini:jsk-lib
-
-net.jini:jsk-dl
-
-net.jini:jsk-policy
-
-net.jini:jsk-platform
-
-net.jini:jsk-resources
-
-org.apache.river:mahalo
-
-org.apache.river:mahalo-dl
-
-org.apache.river:fiddler
-
-org.apache.river:fiddler-dl
-
-org.apache.river:reggie
-
-org.apache.river:reggie-dl
-
-org.apache.river:mercury
-
-org.apache.river:mercury-dl
-
-org.apache.river:outrigger
-
-org.apache.river:outrigger-dl
-
-org.apache.river:start
-
-org.apache.river:tools
-
-org.apache.river:norm
-
-org.apache.river:norm-dl
-
-net.jini.lookup:serviceui
-
-To see how these are used, have a look at the 
-[river-examples 
source](https://www.apache.org/dyn/closer.cgi/river/river-examples-1.0/river-examples-1.0-source-release.zip)
+### Maven Artifacts
+Project artifacts are uploaded to [River maven 
repository](https://maven-repository.com/artifact/org.apache.river)
+(can also be found [here](https://mvnrepository.com/artifact/org.apache.river))
+and [Jini maven repository](https://maven-repository.com/artifact/net.jini)
+
+The following is from Brian Murphy's post (not available any more) on the 
developer mailing list highlight
+some of the history behind the River/Jini JAR artifacts.
+
+<blockquote>
+<small>
+<p>
+... For those who might be wondering about artifacts like jini-core.jar, 
jini-ext.jar, sun-util.jar, etc., although
+there have been previous postings discussing how they are no longer needed, it 
might help some of the new folks on the
+list to hear a repeat of the history of those artifacts; and why they should 
not be used, and why they should probably
+be removed from the build.
+</p>
+<p>
+Back in the old jini 2.x release time frame, there was quite a bit of time and 
thought put into how the distribution
+should be re-packaged to address deployment issues; for example, better 
modularity, supporting overlays when upgrading,
+ etc. That work resulted in the current artifact structure we now see;
+ jsk-platform/jsk-lib/jsk-resources/jsk-dl/<service>/<service>-dl.
+</p>
+<p>
+But because the team did not want to break existing deployments that relied on 
the old jar structure, they decided to
+ also include the old artifacts in the release; along with a detailed release 
note explaining the new philosophy and
+ encouraging folks to move to the new model, and be prepared for the removal 
of those old jar files down the road.
+ Unfortunately, due to unforeseen events, the removal of the old unnecessary 
jar files never occurred, and people
+ seem to still be using them (at least, based on postings on the various user 
lists out there).
+...
+</p>
+</small>
+</blockquote>
+
+
+To see how these are used,
+[download](https://www.apache.org/dyn/closer.cgi/river/river-examples-1.0/river-examples-1.0-source-release.zip)
+and have a look at the river-examples source.
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jsk.version>2.2.2</jsk.version>
+        <jsk.version>2.2.3</jsk.version>
     </properties>
 
     <dependencyManagement>

Copied: river/site/trunk/content/user-doc/networking.mdtext (from r1775683, 
river/site/trunk/content/networking.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/networking.mdtext?p2=river/site/trunk/content/user-doc/networking.mdtext&p1=river/site/trunk/content/networking.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/networking.mdtext (original)
+++ river/site/trunk/content/user-doc/networking.mdtext Thu Dec 22 17:17:48 2016
@@ -16,7 +16,8 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# River networking
+
+### Networking
 
 River application use the following network aspects:
 

Copied: river/site/trunk/content/user-doc/people.mdtext (from r1775683, 
river/site/trunk/content/people.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/people.mdtext?p2=river/site/trunk/content/user-doc/people.mdtext&p1=river/site/trunk/content/people.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/people.mdtext (original)
+++ river/site/trunk/content/user-doc/people.mdtext Thu Dec 22 17:17:48 2016
@@ -1,8 +1,25 @@
 Title: People
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
 
 [TOC]
 
-# Committers
+### Committers
 
 The people listed below are the set of committers to the Apache River project. 
They have all made significant contributions over time to Jini technology and 
the Jini Community.
 
@@ -27,7 +44,7 @@ If you would like to become a committer,
 |Jim Waldo||
 |Jukka Zitting||
 
-# PMC
+### PMC
  * Jonathan Costers
  * Dan Creswell
  * Chris Dolan
@@ -43,12 +60,12 @@ If you would like to become a committer,
  * Jim Waldo
  * Jukka Zitting
 
-# Chair
+### Chair
 The chair of the Apache River PMC is Patricia Shanahan.
 
-# Emeriti
+### Emeriti
 
-## Emeritus committers
+#### Emeritus committers
 
 | Name | Organization |
 |------|--------------|
@@ -64,7 +81,7 @@ The chair of the Apache River PMC is Pat
 |Vinod Johnson|Sun Microsystems|
 |Ron Mann|Sun Microsystems|
 
-## Incubator mentors
+#### Incubator mentors
 
 | Name |
 |------|

Added: river/site/trunk/content/user-doc/readings.mdtext
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/readings.mdtext?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/user-doc/readings.mdtext (added)
+++ river/site/trunk/content/user-doc/readings.mdtext Thu Dec 22 17:17:48 2016
@@ -0,0 +1,31 @@
+Title: Interesting readings
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+
+### Interesting readings
+
+ - [IoT Security Fundamentals That Need To Be 
Solved](https://codek.tv/v/DIhcDRvHii0/iot-security-fundamentals-that-need-to-be-solved/)
+ - [A New, Open Source Tool Proves: Even After Patching, Deserializing Will 
Still Kill 
You](https://www.contrastsecurity.com/security-influencers/java-deserializing-open-source-tool)
+ - <a 
href="https://blogs.oracle.com/hinkmond/entry/easy_iot_sensor_on_boarding"; 
data-toggle="tooltip" title="Making Internet of Things (IoT) Smarter with Java 
Technology and Deep Learning AI">Hinkmond Wong's Weblog</a>
+ - <a href"http://www.eclipse.org/californium data-toggle="tooltip" title="The 
Californium (Cf) core provides the central framework with the protocol 
implementation to build your Internet of Things applications.">Californium</a>
+ - [Android N switches to 
OpenJDK](http://arstechnica.co.uk/tech-policy/2016/01/android-n-switches-to-openjdk-google-tells-oracle-it-is-protected-by-the-gpl/)
+ - [Reducing Security Overhead to Enhance Service Delivery in Jini 
IoT](http://www.hindawi.com/journals/ijdsn/2015/205793/)
+ -  <a href="http://www.psinaptic.com/link_files/PsiNapticTelematics.pdf"; 
data-toggle="tooltip" title="A small footprint, fully JCK compliant 
implementation of Jini's lookup service written in C">Jini's lookup service 
written in C</a>
+ - [IoT security fundamentals that need to be 
solved](https://codek.tv/v/DIhcDRvHii0/iot-security-fundamentals-that-need-to-be-solved/)
+
+

Copied: river/site/trunk/content/user-doc/releases.mdtext (from r1766308, 
river/site/trunk/content/downloads.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/releases.mdtext?p2=river/site/trunk/content/user-doc/releases.mdtext&p1=river/site/trunk/content/downloads.mdtext&r1=1766308&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/downloads.mdtext (original)
+++ river/site/trunk/content/user-doc/releases.mdtext Thu Dec 22 17:17:48 2016
@@ -1,13 +1,31 @@
-Title: Downloads
+Title: Releases
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
 
-# Apache River Downloads
 
+## Releases
 
 Use the links below to download Apache River releases from one of our mirrors. 
You should verify the integrity of the files using the signatures and checksums 
available from this page.
 
 Apache River releases are available under the [Apache License, Version 
2.0](http://www.apache.org/licenses/LICENSE-2.0). See the NOTICE.txt file 
contained in each release artifact for applicable copyright attribution notices.
 
-## Apache River v2.2.3 (Released Feb 21, 2016)
+
+<div class="space-mn"></div>
+### Apache River v2.2.3 (Released Feb 21, 2016)
 
 This is the "Jini Technology Starter Kit", or "JTSK", i.e. the complete source 
for River 
 and the infrastructure services.
@@ -20,7 +38,9 @@ examples project below, which will autom
 * 
[apache-river-2.2.3-src.tar.gz](http://www.apache.org/dyn/closer.cgi/river/river-2.2.3/apache-river-2.2.3-src.tar.gz)
 
([PGP](http://www.apache.org/dist/river/river-2.2.3/apache-river-2.2.3-src.tar.gz.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.3/apache-river-2.2.3-src.tar.gz.sha))
 * 
[apache-river-2.2.3-doc.tar.gz](http://www.apache.org/dyn/closer.cgi/river/river-2.2.3/apache-river-2.2.3-bin.tar.gz)
 
([PGP](http://www.apache.org/dist/river/river-2.2.3/apache-river-2.2.3-doc.tar.gz.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.3/apache-river-2.2.3-doc.tar.gz.sha))
 
-## Apache River Examples v1.0 (Released Aug 10, 2015)
+
+<div class="space-mn"></div>
+### Apache River Examples v1.0 (Released Aug 10, 2015)
 
 The examples project contains a set of introductory examples of River services 
and clients.  This project builds 
 using [Apache Maven](maven.apache.org).  You don't need to download and build 
the JTSK in order to use the
@@ -33,16 +53,21 @@ Unpack the examples project and follow t
 
[MD5](https://dist.apache.org/repos/dist/release/river/river-examples-1.0/river-examples-1.0-source-release.zip.md5))
 
 
-# Archived Releases
 
-## Apache River v2.2.2 (Released Nov. 18, 2013)
+<div class="space-lg"></div>
+## Archived Releases
+
+<div class="space-mn"></div>
+### Apache River v2.2.2 (Released Nov. 18, 2013)
 
 * 
[apache-river-2.2.2-src.zip](http://archive.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-src.zip)
 
([PGP](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-src.zip.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-src.zip.sha))
 * 
[apache-river-2.2.2-bin.zip](http://archive.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-bin.zip)
 
([PGP](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-bin.zip.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-bin.zip.sha))
 * 
[apache-river-2.2.2-src.tar.gz](http://archive.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-src.tar.gz)
 
([PGP](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-src.tar.gz.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-src.tar.gz.sha))
 * 
[apache-river-2.2.2-bin.tar.gz](http://archive.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-bin.tar.gz)
 
([PGP](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-bin.tar.gz.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.2/apache-river-2.2.2-bin.tar.gz.sha))
 
-## Apache River v2.2.1 (Released May 4, 2013)
+
+<div class="space-mn"></div>
+### Apache River v2.2.1 (Released May 4, 2013)
 
 * 
[apache-river-2.2.1-src.zip](http://archive.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-src.zip)
 
([PGP](http://www.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-src.zip.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-src.zip.sha))
 * 
[apache-river-2.2.1-bin.zip](http://archive.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-bin.zip)
 
([PGP](http://www.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-bin.zip.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-bin.zip.sha))
@@ -50,13 +75,16 @@ Unpack the examples project and follow t
 * 
[apache-river-2.2.1-bin.tar.gz](http://archive.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-bin.tar.gz)
 
([PGP](http://www.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-bin.tar.gz.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.1/apache-river-2.2.1-bin.tar.gz.sha))
 
 
-## Apache River v2.2.0 (First Top Level Project release)
+<div class="space-mn"></div>
+### Apache River v2.2.0 (First Top Level Project release)
 
 * 
[apache-river-2.2.0-src.zip](http://archive.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-src.zip)
 
([PGP](http://www.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-src.zip.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-src.zip.sha))
 * 
[apache-river-2.2.0-bin.zip](http://archive.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-bin.zip)
 
([PGP](http://www.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-bin.zip.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-bin.zip.sha))
 * 
[apache-river-2.2.0-src.tar.gz](http://archive.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-src.tar.gz)
 
([PGP](http://www.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-src.tar.gz.asc),
 
[SHA1](http://www.apache.org/dist/river/river-.2.0/apache-river-2.2.0-src.tar.gz.sha))
 * 
[apache-river-2.2.0-bin.tar.gz](http://archive.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-bin.tar.gz)
 
([PGP](http://www.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-bin.tar.gz.asc),
 
[SHA1](http://www.apache.org/dist/river/river-2.2.0/apache-river-2.2.0-bin.tar.gz.sha))
 
+
+<div class="space-lg"></div>
 ## Continuous snapshots
 Download the build artifacts from our [trunk 
build](https://builds.apache.org/pview/job/River-trunk-jdk7/lastSuccessfulBuild)
 
@@ -73,8 +101,9 @@ and the mirror sites.
 Older releases can be obtained from the [archive 
site](http://archive.apache.org/dist/river/),
 and the 2.1.x releases made during incubation are available from the 
[Incubator archive](http://archive.apache.org/dist/incubator/river/).
 
-## PGP Signatures
 
+<div class="space-lg"></div>
+## PGP Signatures
 
 All of the release distribution packages have been digitally signed (using PGP 
or GPG) by the Apache Group members that constructed them. There will be an 
accompanying distribution.asc file in the same directory as the distribution. 
The PGP keys can be found in the MIT key repository (hkp://pgp.mit.edu), the 
OpenPGP Public Key repository (hkp://subkeys.pgp.net), and within this 
project's KEYS file, which is located within each download directory.
 

Copied: river/site/trunk/content/user-doc/resources.mdtext (from r1775683, 
river/site/trunk/content/resources.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/resources.mdtext?p2=river/site/trunk/content/user-doc/resources.mdtext&p1=river/site/trunk/content/resources.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/resources.mdtext (original)
+++ river/site/trunk/content/user-doc/resources.mdtext Thu Dec 22 17:17:48 2016
@@ -1,4 +1,4 @@
-Title: External resources
+Title: Resources
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information
@@ -16,10 +16,11 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Resources
 
+### Resources
 
  * Apache Incubator [Proposal for the River project ]( 
http://wiki.apache.org/incubator/RiverProposal)
  * [Jini.org ]( http://www.jini.org)
- * [Jini project area on Java.net ]( http://jini.dev.java.net)
+ * [Jini project area on Java.net ](https://java.net/projects/jini)
  * Jan Newmarch's [Guide to Jini Technologies ]( 
http://jan.newmarch.name/java/jini/tutorial/Jini.html)
+ * [Wiki](https://wiki.apache.org/river/)
\ No newline at end of file

Copied: river/site/trunk/content/user-doc/success-stories.mdtext (from 
r1775683, river/site/trunk/content/success-stories.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/success-stories.mdtext?p2=river/site/trunk/content/user-doc/success-stories.mdtext&p1=river/site/trunk/content/success-stories.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/success-stories.mdtext (original)
+++ river/site/trunk/content/user-doc/success-stories.mdtext Thu Dec 22 
17:17:48 2016
@@ -16,9 +16,11 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Success Stories
 
-## Jini Success Stories
+### Success Stories
+
+<div class="space-sm"></div>
+#### Jini Success Stories
 
  - [Original Jini.org success 
stories](http://www.jini.org/wiki/Who_uses_Jini%3F), including:
      1. [TNO ICT, The 
Netherlands](http://www.tno.nl/informatie-_en_communicatietechnologie/)
@@ -27,13 +29,23 @@ Notice:    Licensed to the Apache Softwa
  - 
[JavaWorld](http://www.javaworld.com/javaworld/jw-10-2001/jw-1005-jiniinterview.html)
 interview with Dr. Ted Achacoso from GroupServe
  - [Jan Newmarch's Guide to Jini 
Technologies](http://jan.newmarch.name/java/jini/tutorial/Overview.html#Success 
Stories) contains a section on Jini successes
 
-## Blitz
-To borrow from the [Blitz project](http://www.dancres.org/blitz/) homepage: 
"The purpose of the  is to further the use of JavaSpaces and JINITM through the 
provision of essential resources"
 
-## Glyph
+<div class="space-mn"></div>
+#### Blitz
+A performant, persistent implementation of the JavaSpaces API, which is much 
more suitable for enterprise-grade use
+than the (in-memory only) reference implementation, Outrigger [see 
here](https://github.com/dancres/blitzjavaspaces).
+
+A re-packaging of the Blitz project to build with Maven is available 
[here](https://github.com/DawidLoubser/blitz-javaspaces-modularised).
+ It makes easy to provision a reliable, persistent JavaSpace with Rio.
+
+
+<div class="space-mn"></div>
+#### Glyph
 [Glyph](https://glyph.dev.java.net/) is a set of utilities and annotations to 
speed up development for Jini-enabled applications.
 
-## Rio
+
+<div class="space-mn"></div>
+#### Rio
 [Rio](http://www.rio-project.org)  is an open source technology that provides 
a dynamic architecture for developing, deploying and managing distributed 
systems composed of services. 
 
 Rio turns a network of compute resources into a dynamic service, providing a 
policy based approach for fault detection and recovery, scalability and dynamic 
deployment. Key to the architecture are a set of dynamic capabilities and 
reliance on policy-based and SLA mechanisms. 
@@ -52,49 +64,58 @@ Key features include:
       1. Spring
       1. Maven based artifact resolution
 
-##Sucden Financial Limited 
-
-> [Sucden Financial Limited](http://www.sucdenfinancial.com/) develops
-> its own futures and options trading system called STAR, built
-> primarily on the Java and Jini (Apache River) technologies.
-> 
-> The development of the system began when I joined Sucden almost ten
-> years ago, beginning with connection to the Liffe derivatives
-> exchange. It soon became the company’s primary trading system, and
-> connectivity to the ICE and LME exchanges quickly followed.
-> 
-> With many local and remote users and ever increasing trading volumes,
-> the typically n-tier architecture was difficult to upgrade, suffered
-> from problems with scalability and was very susceptible to
-> communications failures between it and the exchange host systems.
-> 
-> In 2006 we started a project to migrate to a service oriented
-> architecture, specifically choosing Jini as a 100% Java solution. Jini
-> had been around for a long time and I always thought it held great
-> promise for our kinds of application, which needed very high
-> throughput and fault tolerance – we (myself, Phil Harron and Hector
-> Angel), were itching to use it for something useful. We hired IncaX
-> consultants Phil Bishop and Nigel Warren to help us get going on the
-> project. In 2007, Tom Hobbs and Ian Wood joined us and we began
-> building all kinds of service management tools and infrastructure to
-> encapsulate the complexities of Jini. A new kind of STAR was finally
-> born early in 2009.
-> 
-> Jini has allowed us to move all our business logic into services,
-> allowing for superb scalability, redundant exchange connections, and
-> fault tolerant patterns which enable us to upgrade and perform
-> maintenance in a live scenario. The system can monitor itself and
-> alert support staff of problems automatically.
-> 
-> To visualize and manage the entire system, we built [an application on
-> the Netbeans 
platform](http://netbeans.dzone.com/nb-financial-management-console)
-> where we can immediately see the interaction between services and generally 
monitor
-> the health of the system as a whole. This is an ideal platform on
-> which to present the Jini service UIs.
-> 
-> We are looking forward to upgrading to the Apache River code in 2011
-> and hope that the renewed efforts on this open source project will
-> help to spread the word about this excellent technology far and wide."
 
+<div class="space-mn"></div>
+#### Sucden Financial Limited
+<blockquote>
+<small>
+<p>
+  [Sucden Financial Limited](http://www.sucdenfinancial.com/) develops
+ its own futures and options trading system called STAR, built
+ primarily on the Java and Jini (Apache River) technologies.
+
+ The development of the system began when I joined Sucden almost ten
+ years ago, beginning with connection to the Liffe derivatives
+ exchange. It soon became the company’s primary trading system, and
+ connectivity to the ICE and LME exchanges quickly followed.
+
+ With many local and remote users and ever increasing trading volumes,
+ the typically n-tier architecture was difficult to upgrade, suffered
+ from problems with scalability and was very susceptible to
+ communications failures between it and the exchange host systems.
+
+ In 2006 we started a project to migrate to a service oriented
+ architecture, specifically choosing Jini as a 100% Java solution. Jini
+ had been around for a long time and I always thought it held great
+ promise for our kinds of application, which needed very high
+ throughput and fault tolerance – we (myself, Phil Harron and Hector
+ Angel), were itching to use it for something useful. We hired IncaX
+ consultants Phil Bishop and Nigel Warren to help us get going on the
+ project. In 2007, Tom Hobbs and Ian Wood joined us and we began
+ building all kinds of service management tools and infrastructure to
+ encapsulate the complexities of Jini. A new kind of STAR was finally
+ born early in 2009.
+
+ Jini has allowed us to move all our business logic into services,
+ allowing for superb scalability, redundant exchange connections, and
+ fault tolerant patterns which enable us to upgrade and perform
+ maintenance in a live scenario. The system can monitor itself and
+ alert support staff of problems automatically.
+
+ To visualize and manage the entire system, we built [an application on
+ the Netbeans 
platform](http://netbeans.dzone.com/nb-financial-management-console)
+ where we can immediately see the interaction between services and generally 
monitor
+ the health of the system as a whole. This is an ideal platform on
+ which to present the Jini service UIs.
+
+ We are looking forward to upgrading to the Apache River code in 2011
+ and hope that the renewed efforts on this open source project will
+ help to spread the word about this excellent technology far and wide."
+</p>
+<cite title="Mark Phipps">
 Mark Phipps
-Front Office Development Manager, Sucden Financial Limited.
\ No newline at end of file
+Front Office Development Manager, Sucden Financial Limited.
+</cite>
+</small>
+</blockquote>
+

Copied: river/site/trunk/content/user-doc/supported-platforms.mdtext (from 
r1766308, river/site/trunk/content/supported-platforms.mdtext)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/supported-platforms.mdtext?p2=river/site/trunk/content/user-doc/supported-platforms.mdtext&p1=river/site/trunk/content/supported-platforms.mdtext&r1=1766308&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/supported-platforms.mdtext (original)
+++ river/site/trunk/content/user-doc/supported-platforms.mdtext Thu Dec 22 
17:17:48 2016
@@ -1,4 +1,4 @@
-Title:     Supported platforms
+Title: Supported platforms
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information
@@ -16,9 +16,12 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Supported platforms
 
-## Operating systems
+### Supported platforms
+
+####
+
+#### Operating systems
 OS | Remarks
 -- | ----
 solaris |
@@ -27,7 +30,9 @@ windows |
 freebsd | No recent information available: No up to date JDK available.
 osx | No recent information available: [osx build server 
unavailable](http://mail-archives.apache.org/mod_mbox/www-builds/201111.mbox/%3ccaojncycgmtcrhee4+mbocnbrpelavryor7+4ypzfr3kwkto...@mail.gmail.com%3E)
 
-## Java runtime versions
+####
+
+#### Java runtime versions
 
 Version | Remarks
 ------- | -----
@@ -43,11 +48,14 @@ Notes:
 
 The com.sun.* packages are only available on Sun/Oracle based JDK's
 
-## Authentication subsystems
+####
+
+
+#### Authentication subsystems
 
 System | Remarks
 ------ | -------
 Kerberos | Untested
 
-## Testing framework
+#### Testing framework
 Our current quality assurance (QA) framework only works with JDK6. 

Added: river/site/trunk/content/user-doc/website.mdtext
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/user-doc/website.mdtext?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/user-doc/website.mdtext (added)
+++ river/site/trunk/content/user-doc/website.mdtext Thu Dec 22 17:17:48 2016
@@ -0,0 +1,37 @@
+Title:     Web site
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+
+## Web site
+
+If you find something on our pages that needs to be corrected, would like to 
add new information or do other changes,
+here are some details to start with.
+
+ - River's site relies on Apache CMS system. Find generic information about 
[how to manage a project website](https://www.apache.org/dev/project-site.html)
+ - River CMS is listed among [Apache CMS 
projects](https://cms.apache.org/#bookmark). This is the starting point for
+the web based editor.
+ - The CMS is based on [markdown and 
additions](https://www.apache.org/dev/cmsref#markdown) for creating content.
+ - Our pages also make use of Bootstrap framework and ['Spacelab' 
theme](https://bootswatch.com/spacelab/) for it.
+If your are new to the framework see this nice introductory 
[material](http://www.w3schools.com/Bootstrap/default.asp).
+ - Some more elements are added by using [Font 
Awesome](http://fontawesome.io/cheatsheet/).
+
+
+<div class="alert alert-info">
+Please note that combining markdown and html/Boostrap may sometimes result in 
unexpected look of a page. Moreover
+certain Font Awesome icons do not show up.
+</div>

Modified: river/site/trunk/content/wot.mdtext
URL: 
http://svn.apache.org/viewvc/river/site/trunk/content/wot.mdtext?rev=1775684&r1=1775683&r2=1775684&view=diff
==============================================================================
--- river/site/trunk/content/wot.mdtext (original)
+++ river/site/trunk/content/wot.mdtext Thu Dec 22 17:17:48 2016
@@ -1,20 +1,5 @@
 Title: Web of trust
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
+
 
 # Web of trust
 

Added: river/site/trunk/templates/footer.html
URL: 
http://svn.apache.org/viewvc/river/site/trunk/templates/footer.html?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/templates/footer.html (added)
+++ river/site/trunk/templates/footer.html Thu Dec 22 17:17:48 2016
@@ -0,0 +1,22 @@
+<footer>
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-1">
+                <a href="http://apache.org"; target="_blank"><img 
src="/images/apache-logo.png" width="40%"/></a>
+            </div>
+
+            <div class="col-sm-11">
+                <p>Copyright &#169; 2012-2015 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>,
+                    Licensed under the <a 
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version
+                        2.0</a>.
+                    <br/>
+                    Apache River, the Apache River logo, Apache and the Apache 
feather logo are trademarks of The
+                    Apache Software Foundation.
+                    <br/>
+                    All other marks mentioned may be trademarks or registered 
trademarks
+                    of their respective owners.
+                </p>
+            </div>
+        </div>
+    </div>
+</footer>

Copied: river/site/trunk/templates/sidenav.html (from r1767231, 
ace/site/trunk/templates/sidenav.html)
URL: 
http://svn.apache.org/viewvc/river/site/trunk/templates/sidenav.html?p2=river/site/trunk/templates/sidenav.html&p1=ace/site/trunk/templates/sidenav.html&r1=1767231&r2=1775684&rev=1775684&view=diff
==============================================================================
--- ace/site/trunk/templates/sidenav.html (original)
+++ river/site/trunk/templates/sidenav.html Thu Dec 22 17:17:48 2016
@@ -1,70 +1,89 @@
-<ul class="nav">
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b 
class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li>
-        <a href="/news.html">News</a>
-      </li>
-      <li>
-        <a href="/on-the-web.html">On the web</a>
-      </li>
-    </ul>
-  </li>
-  <li>
-    <a href="/downloads.html">Downloads</a>
-  </li>
-  <li>
-    <a href="/docs/index.html">Documentation</a>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b 
class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li>
-        <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
-      </li>
-      <li>
-        <a href="/get-involved/issue-tracking.html">Issue Tracking</a>
-      </li>
-      <li>
-        <a href="/get-involved/continuous-integration.html">Continuous 
Integration</a>
-      </li>
-      <li>
-        <a href="/get-involved/source-code.html">Source Code</a>
-      </li>
-      <li>
-        <a href="/get-involved/project-team.html">Project Team</a>
-      </li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b 
class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li>
-        <a 
href="https://cwiki.apache.org/confluence/display/ACE/Board+Reports";>Board 
Reports <i class="icon-share-alt"></i></a>
-      </li>
-      <li>
-        <a 
href="https://cwiki.apache.org/confluence/display/ACE/Index";>Homepage <i 
class="icon-share-alt"></i></a>
-      </li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b 
class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li>
-        <a href="http://www.apache.org/";>Apache Homepage <i 
class="icon-share-alt"></i></a>
-      </li>
-      <li>
-        <a href="http://www.apache.org/licenses/";>Licenses <i 
class="icon-share-alt"></i></a>
-      </li>
-      <li>
-        <a href="http://www.apache.org/security/";>Security <i 
class="icon-share-alt"></i></a>
-      </li>
-      <li>
-        <a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship <i 
class="icon-share-alt"></i></a>
-      </li>
-      <li>
-        <a href="http://www.apache.org/foundation/thanks.html";>Thanks <i 
class="icon-share-alt"></i></a>
-      </li>
-    </ul>
-  </li>
-</ul>
+<div class="container">
+    <div class="navbar-header">
+        <a class="navbar-brand" href="/index.html"><img 
src="/images/river_logo.png">Apache River&trade;</a>
+    </div>
+
+    <div class="navbar-collapse collapse" id="navbar-main">
+        <ul class="nav navbar-nav">
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button"
+                   aria-expanded="false">Downloads <span 
class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="/user-doc/releases.html">Releases</a></li>
+                    <li><a href="/user-doc/maven-artifacts.html">Maven 
artifacts</a></li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button"
+                   aria-expanded="false">Documentation <span 
class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="/user-doc/getting-started.html">Getting 
started</a></li>
+                    <li><a href="/user-doc/networking.html">Networking</a></li>
+                    <li><a href="/user-doc/glossary.html">Glossary</a></li>
+                    <li><a href="/user-doc/cookbook.html">Cookbook</a></li>
+                    <li><a href="/user-doc/supported-platforms.html">Supported 
platforms</a></li>
+                    <li><a href="/user-doc/resources.html">Resources</a></li>
+                    <li><a href="/user-doc/readings.html">Readings</a></li>
+                    <li class="divider"></li>
+                    <li><a 
href="/release-doc/2.2.2/spec-index.html">Specification</a></li>
+                    <li class="divider"></li>
+                    <li><a 
href="/release-doc/2.2.2/api/index.html">Javadoc</a></li>
+                </ul>
+            </li>
+
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button"
+                   aria-expanded="false">Community <span 
class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="/user-doc/get-involved.html">Get 
involved</a></li>
+                    <li><a href="/user-doc/mailing-lists.html">Mailing 
lists</a></li>
+                    <li><a href="/user-doc/found-a-bug.html">Found a 
bug</a></li>
+                    <li><a href="/user-doc/website.html">Web site</a></li>
+                    <li><a href="/user-doc/people.html">People</a></li>
+                    <li><a href="/user-doc/success-stories.html">Success 
stories</a></li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button"
+                   aria-expanded="false">Development <span 
class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="/dev-doc/source-code.html">Source 
code</a></li>
+                    <li><a 
href="/dev-doc/development-process.html">Development process</a></li>
+                    <li><a href="/dev-doc/building-river.html">Building 
River</a></li>
+                    <li><a href="/dev-doc/ci.html">Continuous 
Integration</a></li>
+                    <li><a href="/dev-doc/building-a-release.html">Building a 
release</a></li>
+                    <li><a 
href="https://issues.apache.org/jira/browse/RIVER";>Issue tracker</a></li>
+                </ul>
+            </li>
+        </ul>
+
+        <ul class="nav navbar-nav navbar-right">
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button"
+                   aria-expanded="false">The Foundation <span 
class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="http://www.apache.org";>Apache</a></li>
+                    <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                    <li><a 
href="http://www.apache.org/foundation/how-it-works.html";>How it
+                        works</a></li>
+                </ul>
+            </li>
+        </ul>
+
+        <form class="navbar-form navbar-right" role="search"
+              name="search" id="search" action="http://www.google.com/search"; 
method="get">
+            <input value="river.apache.org" name="sitesearch" type="hidden"/>
+            <div class="form-group input-group" style="padding: 6px">
+                <input type="text" name="q" id="query" placeholder="Google 
custom search" class="form-control input-sm">
+                <span class="input-group-btn">
+                    <button type="submit" class="btn btn-default btn-sm">
+                        <img src="/images/search_box_icon.png" width="15" 
height="17"/>
+                        </button>
+                                 </span>
+            </div>
+        </form>
+
+    </div>
+</div>
+


Reply via email to