You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2015/04/15 23:40:09 UTC

svn commit: r947786 [19/30] - in /websites/staging/isis/trunk: cgi-bin/ content/ content/docs/ content/docs/css/asciidoctor/ content/docs/css/font-awesome/4.3.0/css/ content/docs/css/font-awesome/4.3.0/fonts/ content/docs/css/font-awesome/4.3.0/less/ c...

Added: websites/staging/isis/trunk/content/docs/js/foundation/5.5.1/vendor/modernizr.js
==============================================================================
--- websites/staging/isis/trunk/content/docs/js/foundation/5.5.1/vendor/modernizr.js (added)
+++ websites/staging/isis/trunk/content/docs/js/foundation/5.5.1/vendor/modernizr.js Wed Apr 15 21:40:06 2015
@@ -0,0 +1,8 @@
+/*!
+ * Modernizr v2.8.3
+ * www.modernizr.com
+ *
+ * Copyright (c) Faruk Ates, Paul Irish, Alex Sexton
+ * Available under the BSD and MIT licenses: www.modernizr.com/license/
+ */
+window.Modernizr=function(a,b,c){function d(a){t.cssText=a}function e(a,b){return d(x.join(a+";")+(b||""))}function f(a,b){return typeof a===b}function g(a,b){return!!~(""+a).indexOf(b)}function h(a,b){for(var d in a){var e=a[d];if(!g(e,"-")&&t[e]!==c)return"pfx"==b?e:!0}return!1}function i(a,b,d){for(var e in a){var g=b[a[e]];if(g!==c)return d===!1?a[e]:f(g,"function")?g.bind(d||b):g}return!1}function j(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+z.join(d+" ")+d).split(" ");return f(b,"string")||f(b,"undefined")?h(e,b):(e=(a+" "+A.join(d+" ")+d).split(" "),i(e,b,c))}function k(){o.input=function(c){for(var d=0,e=c.length;e>d;d++)E[c[d]]=!!(c[d]in u);return E.list&&(E.list=!(!b.createElement("datalist")||!a.HTMLDataListElement)),E}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),o.inputtypes=function(a){for(var d,e,f,g=0,h=a.length;h>g;g++)u.setAttribute("type",e=a[g]),d="text"!==u.type,d&&(u.value=v,u.style.cssText="positi
 on:absolute;visibility:hidden;",/^range$/.test(e)&&u.style.WebkitAppearance!==c?(q.appendChild(u),f=b.defaultView,d=f.getComputedStyle&&"textfield"!==f.getComputedStyle(u,null).WebkitAppearance&&0!==u.offsetHeight,q.removeChild(u)):/^(search|tel)$/.test(e)||(d=/^(url|email)$/.test(e)?u.checkValidity&&u.checkValidity()===!1:u.value!=v)),D[a[g]]=!!d;return D}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var l,m,n="2.8.3",o={},p=!0,q=b.documentElement,r="modernizr",s=b.createElement(r),t=s.style,u=b.createElement("input"),v=":)",w={}.toString,x=" -webkit- -moz- -o- -ms- ".split(" "),y="Webkit Moz O ms",z=y.split(" "),A=y.toLowerCase().split(" "),B={svg:"http://www.w3.org/2000/svg"},C={},D={},E={},F=[],G=F.slice,H=function(a,c,d,e){var f,g,h,i,j=b.createElement("div"),k=b.body,l=k||b.createElement("body");if(parseInt(d,10))for(;d--;)h=b.createElement("div"),h.id=e?e[d]:r+(d+1),j.appendChild(h);return f=["&#173;",'<style id="s',r,'">'
 ,a,"</style>"].join(""),j.id=r,(k?j:l).innerHTML+=f,l.appendChild(j),k||(l.style.background="",l.style.overflow="hidden",i=q.style.overflow,q.style.overflow="hidden",q.appendChild(l)),g=c(j,a),k?j.parentNode.removeChild(j):(l.parentNode.removeChild(l),q.style.overflow=i),!!g},I=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b)&&c(b).matches||!1;var d;return H("@media "+b+" { #"+r+" { position: absolute; } }",function(b){d="absolute"==(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).position}),d},J=function(){function a(a,e){e=e||b.createElement(d[a]||"div"),a="on"+a;var g=a in e;return g||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(a,""),g=f(e[a],"function"),f(e[a],"undefined")||(e[a]=c),e.removeAttribute(a))),e=null,g}var d={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return a}(),K={}.hasOwnProperty;m=f(K,"undefined")||f(K.call,"undefined")?function(a,b){ret
 urn b in a&&f(a.constructor.prototype[b],"undefined")}:function(a,b){return K.call(a,b)},Function.prototype.bind||(Function.prototype.bind=function(a){var b=this;if("function"!=typeof b)throw new TypeError;var c=G.call(arguments,1),d=function(){if(this instanceof d){var e=function(){};e.prototype=b.prototype;var f=new e,g=b.apply(f,c.concat(G.call(arguments)));return Object(g)===g?g:f}return b.apply(a,c.concat(G.call(arguments)))};return d}),C.flexbox=function(){return j("flexWrap")},C.flexboxlegacy=function(){return j("boxDirection")},C.canvas=function(){var a=b.createElement("canvas");return!(!a.getContext||!a.getContext("2d"))},C.canvastext=function(){return!(!o.canvas||!f(b.createElement("canvas").getContext("2d").fillText,"function"))},C.webgl=function(){return!!a.WebGLRenderingContext},C.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:H(["@media (",x.join("touch-enabled),("),r,")","{#modernizr{top:9px;position:absolute}}"].join
 (""),function(a){c=9===a.offsetTop}),c},C.geolocation=function(){return"geolocation"in navigator},C.postmessage=function(){return!!a.postMessage},C.websqldatabase=function(){return!!a.openDatabase},C.indexedDB=function(){return!!j("indexedDB",a)},C.hashchange=function(){return J("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},C.history=function(){return!(!a.history||!history.pushState)},C.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},C.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},C.rgba=function(){return d("background-color:rgba(150,255,150,.5)"),g(t.backgroundColor,"rgba")},C.hsla=function(){return d("background-color:hsla(120,40%,100%,.5)"),g(t.backgroundColor,"rgba")||g(t.backgroundColor,"hsla")},C.multiplebgs=function(){return d("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(t.background)},C.backgroundsize=function(){return j("backgroundSize")},C.border
 image=function(){return j("borderImage")},C.borderradius=function(){return j("borderRadius")},C.boxshadow=function(){return j("boxShadow")},C.textshadow=function(){return""===b.createElement("div").style.textShadow},C.opacity=function(){return e("opacity:.55"),/^0.55$/.test(t.opacity)},C.cssanimations=function(){return j("animationName")},C.csscolumns=function(){return j("columnCount")},C.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return d((a+"-webkit- ".split(" ").join(b+a)+x.join(c+a)).slice(0,-a.length)),g(t.backgroundImage,"gradient")},C.cssreflections=function(){return j("boxReflect")},C.csstransforms=function(){return!!j("transform")},C.csstransforms3d=function(){var a=!!j("perspective");return a&&"webkitPerspective"in q.style&&H("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b){a=9===b.offsetLeft&&3===b
 .offsetHeight}),a},C.csstransitions=function(){return j("transition")},C.fontface=function(){var a;return H('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&0===g.indexOf(d.split(" ")[0])}),a},C.generatedcontent=function(){var a;return H(["#",r,"{font:0/0 a}#",r,':after{content:"',v,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},C.video=function(){var a=b.createElement("video"),c=!1;try{(c=!!a.canPlayType)&&(c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,""))}catch(d){}return c},C.audio=function(){var a=b.createElement("audio"),c=!1;try{(c=!!a.canPlayType)&&(c=new Boolean(c),c.ogg=a.canPlayType('audio
 /ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,""))}catch(d){}return c},C.localstorage=function(){try{return localStorage.setItem(r,r),localStorage.removeItem(r),!0}catch(a){return!1}},C.sessionstorage=function(){try{return sessionStorage.setItem(r,r),sessionStorage.removeItem(r),!0}catch(a){return!1}},C.webworkers=function(){return!!a.Worker},C.applicationcache=function(){return!!a.applicationCache},C.svg=function(){return!!b.createElementNS&&!!b.createElementNS(B.svg,"svg").createSVGRect},C.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==B.svg},C.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(w.call(b.createElementNS(B.svg,"animate")))},C.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.
 test(w.call(b.createElementNS(B.svg,"clipPath")))};for(var L in C)m(C,L)&&(l=L.toLowerCase(),o[l]=C[L](),F.push((o[l]?"":"no-")+l));return o.input||k(),o.addTest=function(a,b){if("object"==typeof a)for(var d in a)m(a,d)&&o.addTest(d,a[d]);else{if(a=a.toLowerCase(),o[a]!==c)return o;b="function"==typeof b?b():b,"undefined"!=typeof p&&p&&(q.className+=" "+(b?"":"no-")+a),o[a]=b}return o},d(""),s=u=null,function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=s.elements;return"string"==typeof a?a.split(" "):a}function e(a){var b=r[a[p]];return b||(b={},q++,a[p]=q,r[q]=b),b}function f(a,c,d){if(c||(c=b),k)return c.createElement(a);d||(d=e(c));var f;return f=d.cache[a]?d.cache[a].cloneNode():o.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!f.canHaveChildren||n.test(a)||f.tagUrn?f:d.frag.appendChild(f)}function g(a
 ,c){if(a||(a=b),k)return a.createDocumentFragment();c=c||e(a);for(var f=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)f.createElement(h[g]);return f}function h(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return s.shivMethods?f(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(s,b.frag)}function i(a){a||(a=b);var d=e(a);return!s.shivCSS||j||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),k||h(a,d),a}var j,k,l="3.7.0",m=a.html5||{},n=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,o=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label
 |li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,p="_html5shiv",q=0,r={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",j="hidden"in a,k=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){j=!0,k=!0}}();var s={elements:m.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:l,shivCSS:m.shivCSS!==!1,supportsUnknownElements:k,shivMethods:m.shivMethods!==!1,type:"default",shivDocument:i,createElement:f,createDocumentFragment:g};a.html5=s,i(b)}(this,b),o._version=n,o._prefixes=x,o._domPrefixes=A,o._cssomPrefixes=z,o.mq=I,o.hasEvent=J,o.testProp=function(a){return h([a])},o.testAllProps=j,o.testStyles=H,o.prefixed=function(a,b,c){return b?j(a,b,c):j(a,
 "pfx")},q.className=q.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(p?" js "+F.join(" "):""),o}(this,this.document);
\ No newline at end of file

Added: websites/staging/isis/trunk/content/docs/js/foundation/5.5.1/vendor/placeholder.js
==============================================================================
--- websites/staging/isis/trunk/content/docs/js/foundation/5.5.1/vendor/placeholder.js (added)
+++ websites/staging/isis/trunk/content/docs/js/foundation/5.5.1/vendor/placeholder.js Wed Apr 15 21:40:06 2015
@@ -0,0 +1,2 @@
+/*! http://mths.be/placeholder v2.0.9 by @mathias */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(b){var c={},d=/^jQuery\d+$/;return a.each(b.attributes,function(a,b){b.specified&&!d.test(b.name)&&(c[b.name]=b.value)}),c}function c(b,c){var d=this,f=a(d);if(d.value==f.attr("placeholder")&&f.hasClass("placeholder"))if(f.data("placeholder-password")){if(f=f.hide().nextAll('input[type="password"]:first').show().attr("id",f.removeAttr("id").data("placeholder-id")),b===!0)return f[0].value=c;f.focus()}else d.value="",f.removeClass("placeholder"),d==e()&&d.select()}function d(){var d,e=this,f=a(e),g=this.id;if(""===e.value){if("password"===e.type){if(!f.data("placeholder-textinput")){try{d=f.clone().attr({type:"text"})}catch(h){d=a("<input>").attr(a.extend(b(this),{type:"text"}))}d.removeAttr("name").data({"placeholder-password":f,"placeholder-id":g}).bind("focus.placeholder",c),f.data({"placeholder-textinput":d,"placeholder-id":g}).before(d)}f=f.removeAttr("id").hide().prevAll('i
 nput[type="text"]:first').attr("id",g).show()}f.addClass("placeholder"),f[0].value=f.attr("placeholder")}else f.removeClass("placeholder")}function e(){try{return document.activeElement}catch(a){}}var f,g,h="[object OperaMini]"==Object.prototype.toString.call(window.operamini),i="placeholder"in document.createElement("input")&&!h,j="placeholder"in document.createElement("textarea")&&!h,k=a.valHooks,l=a.propHooks;i&&j?(g=a.fn.placeholder=function(){return this},g.input=g.textarea=!0):(g=a.fn.placeholder=function(){var a=this;return a.filter((i?"textarea":":input")+"[placeholder]").not(".placeholder").bind({"focus.placeholder":c,"blur.placeholder":d}).data("placeholder-enabled",!0).trigger("blur.placeholder"),a},g.input=i,g.textarea=j,f={get:function(b){var c=a(b),d=c.data("placeholder-password");return d?d[0].value:c.data("placeholder-enabled")&&c.hasClass("placeholder")?"":b.value},set:function(b,f){var g=a(b),h=g.data("placeholder-password");return h?h[0].value=f:g.data("placeholde
 r-enabled")?(""===f?(b.value=f,b!=e()&&d.call(b)):g.hasClass("placeholder")?c.call(b,!0,f)||(b.value=f):b.value=f,g):b.value=f}},i||(k.input=f,l.value=f),j||(k.textarea=f,l.value=f),a(function(){a(document).delegate("form","submit.placeholder",function(){var b=a(".placeholder",this).each(c);setTimeout(function(){b.each(d)},10)})}),a(window).bind("beforeunload.placeholder",function(){a(".placeholder").each(function(){this.value=""})}))});
\ No newline at end of file

Added: websites/staging/isis/trunk/content/docs/release-notes/release-notes.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/release-notes/release-notes.html (added)
+++ websites/staging/isis/trunk/content/docs/release-notes/release-notes.html Wed Apr 15 21:40:06 2015
@@ -0,0 +1,780 @@
+<!doctype html>
+
+<html class="no-js" lang="en">
+
+<head>
+
+    <meta charset="utf-8"/>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+
+
+    <title>Release Notes</title>
+
+
+
+    <!--
+
+        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 caching headers -->
+
+    <meta http-equiv="cache-control" content="no-cache" />
+
+    <meta http-equiv="pragma" content="no-cache" />
+
+    <meta http-equiv="expires" content="-1" />
+
+
+
+
+
+    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+
+    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
+
+
+
+    <link href="../css/asciidoctor/stylesheets/foundation-potion.css" rel="stylesheet">
+
+
+
+    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+
+
+
+    <style type="text/css">
+
+        #forkongithub a{
+
+            display: none;
+
+            background:#090;
+
+            color:#fff;
+
+            text-decoration:none;
+
+            font-family:arial, sans-serif;
+
+            text-align:center;
+
+            font-weight:bold;
+
+            padding:5px 40px;
+
+            font-size:1rem;
+
+            line-height:2rem;
+
+            position:relative;
+
+            transition:0.5s;
+
+        }
+
+        #forkongithub a:hover{
+
+            background:#0D0;
+
+            color:#fff;
+
+        }
+
+        #forkongithub a::before,
+
+        #forkongithub a::after{
+
+            content:"";width:100%;
+
+            display:block;
+
+            position:fixed;
+
+            top:1px;
+
+            left:0;
+
+            height:1px;
+
+            background:#fff;
+
+            z-index: 9999;
+
+        }
+
+        #forkongithub a::after{
+
+            bottom:1px;
+
+            top:auto;
+
+        }
+
+        @media screen and (min-width:768px){
+
+            #forkongithub{
+
+                position:fixed;
+
+                display:block;
+
+                top:0;
+
+                right:0;
+
+                width:250px;
+
+                overflow:hidden;
+
+                height:250px;
+
+                z-index: 9999;
+
+            }
+
+            #forkongithub a{
+
+                display:inherit;
+
+                width:250px;
+
+                position:fixed;
+
+                font-size:small;
+
+                top:40px;
+
+                right:-60px;
+
+                transform:rotate(45deg);
+
+                -webkit-transform:rotate(45deg);
+
+                -ms-transform:rotate(45deg);
+
+                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+
+            }
+
+        }
+
+    </style>
+
+
+
+    <style>
+
+        body {
+
+          position: relative;
+
+        }
+
+
+
+        body div#toc li,
+
+        body div#toc2 li {
+
+            list-style-type: none;
+
+        }
+
+
+
+        div#doc-content {
+
+            margin-top: 30px;
+
+        }
+
+
+
+        body div#toc li.active-region:before,
+
+        body div#toc2 li.active-region:before {
+
+            content: "\00BB \0020";
+
+            margin-left: -12px;
+
+        }
+
+
+
+        body div#toc li a.active,
+
+        body div#toc2 li a.active {
+
+            color: red;
+
+        }
+
+
+
+        body div#toc.toc,
+
+        body div#toc.toc2 {
+
+            position: fixed;
+
+            left: auto;
+
+            padding-top: 120px;
+
+            z-index: auto;
+
+            background-color: white;
+
+            border-left-color: #eee;
+
+            border-left-style: solid;
+
+            border-right: none;
+
+        }
+
+    </style>
+
+
+
+</head>
+
+<body>
+
+
+
+    <span id="forkongithub">
+
+        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+
+    </span>
+
+
+
+<div class="row">
+
+
+
+    <div class="fixed contain-to-grid">
+
+        <nav class="top-bar" data-topbar role="navigation">
+
+            <ul class="title-area">
+
+                <li class="name">
+
+                    <h1>
+
+                        <a href="/index.html">Apache Isis&trade;</a>
+
+                    </h1>
+
+                </li>
+
+                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+
+                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+
+            </ul>
+
+
+
+            <section class="top-bar-section">
+
+                <ul class="right">
+
+
+
+                    <li class="has-form">
+
+                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+
+                        <div class="row collapse">
+
+                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+
+                            <INPUT type="hidden" name="cof" value="FORID:0">
+
+                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
+
+                        </div>
+
+                    </FORM>
+
+                     </li>
+
+
+
+                </ul>
+
+
+
+                <!-- Left Nav Section -->
+
+                <ul class="left">
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#" >Demos</b></a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
+
+                        <li><a href="/intro/tutorials/screencasts.html">Screencasts&nbsp;<img src="/images/tv_show-25.png"></a></li>
+
+                        <li><a href="/intro/powered-by/powered-by.html">Powered by</a></li>
+
+                        <li><a href="http://isisdemo.mmyco.co.uk/" target="_blank">Online Demo</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li><a href="/documentation">Documentation</a></li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#">Downloads</a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/intro/getting-started/simpleapp-archetype.html">Isis (Maven archetype)</a></li>
+
+                        <li><a href="/download.html">Isis (downloads)</a></li>
+
+                        <li><a href="http://www.isisaddons.org" target="_blank">Isis Add-ons (not ASF)</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#">Help</a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/support.html">Mailing Lists</a></li>
+
+                        <li><a href="http://isis.markmail.org/search/?q=" target="_blank">Mailing List Archives</a></li>
+
+                        <li><a href="https://issues.apache.org/jira/browse/ISIS" target="_blank">JIRA</a></li>
+
+                        <li><a href="http://github.com/apache/isis" target="_blank">Github mirror</a></li>
+
+                        <li><a href="http://stackoverflow.com/questions/tagged/isis" target="_blank">Stack Overflow</a></li>
+
+                        <li><a href="/contributors/contributing.html">How to contribute</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#" >@ASF</a>
+
+                      <ul class="dropdown">
+
+                        <li>
+
+                          <a href="http://www.apache.org/" target="_blank">Apache Homepage <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/licenses/" target="_blank">Licenses <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/security/" target="_blank">Security <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">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>
+
+                        <li>
+
+                          <a href="{{base}}more-thanks.html">More thanks <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                </ul>
+
+
+
+            </section>
+
+        </nav>
+
+    </div>
+
+</div>
+
+
+
+<div class="row">
+
+    <div class="large-8 medium-8 columns">
+
+
+
+        <div id="doc-content">
+
+          <div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+TODO
+</td>
+</tr>
+</table>
+</div>
+
+        </div>
+
+
+
+        <hr>
+
+        <footer>
+
+          <p class="small">
+
+          Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
+
+          <br/>
+
+          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
+
+          </p>
+
+        </footer>
+
+
+
+    </div>
+
+
+
+    <div class="large-4 medium-4 columns">
+
+        <!-- the 'hide' class is removed by Javascript -->
+
+        <div id="toc" class="toc2 hide">
+
+          
+
+        </div>
+
+    </div>
+
+</div>
+
+
+
+
+
+    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+
+    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+
+
+
+
+
+<script type="text/javascript">
+
+      $(document).foundation();
+
+
+
+      $(document).ready(function(){
+
+        // Cache selectors
+
+        var lastId,
+
+            topMenu = $("div#toc ul"),
+
+            topMenuHeight = 70,
+
+
+
+            menuItems = topMenu.find("a"),
+
+            menuItemsHrefs = menuItems.map(function(){
+
+              var item = $($(this).attr("href"));
+
+              if (item.length) { return item; }
+
+            });
+
+
+
+        // Bind click handler to menu items to scroll animation
+
+        menuItems.click(function(e){
+
+          var href = $(this).attr("href"),
+
+              offsetTop = href === "#" ? 0 : $(href).offset().top-topMenuHeight+1;
+
+          $('html, body').stop().animate({
+
+              scrollTop: offsetTop
+
+          }, 300);
+
+
+
+          e.preventDefault();
+
+        });
+
+
+
+        // Bind to scroll of window
+
+        $(  window ).scroll(function(){
+
+
+
+           // Get container scroll position
+
+           var fromTop = $(this).scrollTop()+topMenuHeight;
+
+
+
+           var cur = menuItemsHrefs.map(function(){
+
+             if ($(this).offset().top < fromTop)
+
+               return this;
+
+           });
+
+
+
+           // Get the id of the current element
+
+           cur = cur[cur.length-1];
+
+
+
+           var id = cur && cur.length ? cur[0].id : "";
+
+
+
+           //console.log("id = " + id + ", lastId = "  + lastId);
+
+
+
+           if (lastId !== id && id) {
+
+               scrollTo(id);
+
+           }
+
+        });
+
+
+
+        scrollTo = function(id) {
+
+              lastId = id;
+
+
+
+              menuItems
+
+                .removeClass("active");
+
+
+
+              menuItems
+
+                .parents()
+
+                .removeClass("active-region");
+
+
+
+              menuItems
+
+                .parents("ul").hide();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .addClass("active");
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parents("ul").show();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parent().children("ul").show();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parents("li").addClass("active-region");
+
+
+
+        }
+
+      menuItems
+
+        .removeClass("active");
+
+
+
+      menuItems
+
+        .parents()
+
+        .removeClass("active-region");
+
+
+
+        var syncMenuItem;
+
+        if(window.location.hash!=="") {
+
+            var menuItemFor = $.grep(menuItems, function(e) {
+
+                return e.hash === window.location.hash;
+
+            });
+
+            console.log(menuItemFor);
+
+            if(menuItemFor.length === 1) {
+
+                syncMenuItem = menuItemFor[0];
+
+            }
+
+        }
+
+
+
+        if(!syncMenuItem){
+
+            syncMenuItem = menuItems[0];
+
+        }
+
+
+
+        $("#toc").removeClass("hide");
+
+
+
+        $(syncMenuItem).click();
+
+
+
+      });
+
+
+
+
+
+</script>
+
+
+
+
+
+</body>
+
+</html>
\ No newline at end of file

Added: websites/staging/isis/trunk/content/docs/user-guide/images/user-guide-how-tos-tips-n-tricks-are-you-sure-happy-case.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/isis/trunk/content/docs/user-guide/images/user-guide-how-tos-tips-n-tricks-are-you-sure-happy-case.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/isis/trunk/content/docs/user-guide/images/user-guide-how-tos-tips-n-tricks-are-you-sure-sad-case.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/isis/trunk/content/docs/user-guide/images/user-guide-how-tos-tips-n-tricks-are-you-sure-sad-case.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/isis/trunk/content/docs/user-guide/images/user-guide-how-tos-tips-n-tricks-are-you-sure.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/isis/trunk/content/docs/user-guide/images/user-guide-how-tos-tips-n-tricks-are-you-sure.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/isis/trunk/content/docs/user-guide/user-guide-config-and-deployment.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-config-and-deployment.html (added)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-config-and-deployment.html Wed Apr 15 21:40:06 2015
@@ -0,0 +1,976 @@
+<!doctype html>
+
+<html class="no-js" lang="en">
+
+<head>
+
+    <meta charset="utf-8"/>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+
+
+    <title>User Guide: Configuration and Deployment</title>
+
+
+
+    <!--
+
+        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 caching headers -->
+
+    <meta http-equiv="cache-control" content="no-cache" />
+
+    <meta http-equiv="pragma" content="no-cache" />
+
+    <meta http-equiv="expires" content="-1" />
+
+
+
+
+
+    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+
+    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
+
+
+
+    <link href="../css/asciidoctor/stylesheets/foundation-potion.css" rel="stylesheet">
+
+
+
+    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+
+
+
+    <style type="text/css">
+
+        #forkongithub a{
+
+            display: none;
+
+            background:#090;
+
+            color:#fff;
+
+            text-decoration:none;
+
+            font-family:arial, sans-serif;
+
+            text-align:center;
+
+            font-weight:bold;
+
+            padding:5px 40px;
+
+            font-size:1rem;
+
+            line-height:2rem;
+
+            position:relative;
+
+            transition:0.5s;
+
+        }
+
+        #forkongithub a:hover{
+
+            background:#0D0;
+
+            color:#fff;
+
+        }
+
+        #forkongithub a::before,
+
+        #forkongithub a::after{
+
+            content:"";width:100%;
+
+            display:block;
+
+            position:fixed;
+
+            top:1px;
+
+            left:0;
+
+            height:1px;
+
+            background:#fff;
+
+            z-index: 9999;
+
+        }
+
+        #forkongithub a::after{
+
+            bottom:1px;
+
+            top:auto;
+
+        }
+
+        @media screen and (min-width:768px){
+
+            #forkongithub{
+
+                position:fixed;
+
+                display:block;
+
+                top:0;
+
+                right:0;
+
+                width:250px;
+
+                overflow:hidden;
+
+                height:250px;
+
+                z-index: 9999;
+
+            }
+
+            #forkongithub a{
+
+                display:inherit;
+
+                width:250px;
+
+                position:fixed;
+
+                font-size:small;
+
+                top:40px;
+
+                right:-60px;
+
+                transform:rotate(45deg);
+
+                -webkit-transform:rotate(45deg);
+
+                -ms-transform:rotate(45deg);
+
+                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+
+            }
+
+        }
+
+    </style>
+
+
+
+    <style>
+
+        body {
+
+          position: relative;
+
+        }
+
+
+
+        body div#toc li,
+
+        body div#toc2 li {
+
+            list-style-type: none;
+
+        }
+
+
+
+        div#doc-content {
+
+            margin-top: 30px;
+
+        }
+
+
+
+        body div#toc li.active-region:before,
+
+        body div#toc2 li.active-region:before {
+
+            content: "\00BB \0020";
+
+            margin-left: -12px;
+
+        }
+
+
+
+        body div#toc li a.active,
+
+        body div#toc2 li a.active {
+
+            color: red;
+
+        }
+
+
+
+        body div#toc.toc,
+
+        body div#toc.toc2 {
+
+            position: fixed;
+
+            left: auto;
+
+            padding-top: 120px;
+
+            z-index: auto;
+
+            background-color: white;
+
+            border-left-color: #eee;
+
+            border-left-style: solid;
+
+            border-right: none;
+
+        }
+
+    </style>
+
+
+
+</head>
+
+<body>
+
+
+
+    <span id="forkongithub">
+
+        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+
+    </span>
+
+
+
+<div class="row">
+
+
+
+    <div class="fixed contain-to-grid">
+
+        <nav class="top-bar" data-topbar role="navigation">
+
+            <ul class="title-area">
+
+                <li class="name">
+
+                    <h1>
+
+                        <a href="/index.html">Apache Isis&trade;</a>
+
+                    </h1>
+
+                </li>
+
+                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+
+                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+
+            </ul>
+
+
+
+            <section class="top-bar-section">
+
+                <ul class="right">
+
+
+
+                    <li class="has-form">
+
+                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+
+                        <div class="row collapse">
+
+                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+
+                            <INPUT type="hidden" name="cof" value="FORID:0">
+
+                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
+
+                        </div>
+
+                    </FORM>
+
+                     </li>
+
+
+
+                </ul>
+
+
+
+                <!-- Left Nav Section -->
+
+                <ul class="left">
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#" >Demos</b></a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
+
+                        <li><a href="/intro/tutorials/screencasts.html">Screencasts&nbsp;<img src="/images/tv_show-25.png"></a></li>
+
+                        <li><a href="/intro/powered-by/powered-by.html">Powered by</a></li>
+
+                        <li><a href="http://isisdemo.mmyco.co.uk/" target="_blank">Online Demo</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li><a href="/documentation">Documentation</a></li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#">Downloads</a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/intro/getting-started/simpleapp-archetype.html">Isis (Maven archetype)</a></li>
+
+                        <li><a href="/download.html">Isis (downloads)</a></li>
+
+                        <li><a href="http://www.isisaddons.org" target="_blank">Isis Add-ons (not ASF)</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#">Help</a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/support.html">Mailing Lists</a></li>
+
+                        <li><a href="http://isis.markmail.org/search/?q=" target="_blank">Mailing List Archives</a></li>
+
+                        <li><a href="https://issues.apache.org/jira/browse/ISIS" target="_blank">JIRA</a></li>
+
+                        <li><a href="http://github.com/apache/isis" target="_blank">Github mirror</a></li>
+
+                        <li><a href="http://stackoverflow.com/questions/tagged/isis" target="_blank">Stack Overflow</a></li>
+
+                        <li><a href="/contributors/contributing.html">How to contribute</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#" >@ASF</a>
+
+                      <ul class="dropdown">
+
+                        <li>
+
+                          <a href="http://www.apache.org/" target="_blank">Apache Homepage <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/licenses/" target="_blank">Licenses <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/security/" target="_blank">Security <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">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>
+
+                        <li>
+
+                          <a href="{{base}}more-thanks.html">More thanks <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                </ul>
+
+
+
+            </section>
+
+        </nav>
+
+    </div>
+
+</div>
+
+
+
+<div class="row">
+
+    <div class="large-8 medium-8 columns">
+
+
+
+        <div id="doc-content">
+
+          <div id="preamble">
+<div class="sectionbody">
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+TODO
+</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_configuration_files">Configuration Files</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Isis' own configuration properties are simple key-value pairs, typically held in in the <code>WEBINF/isis.properties</code> file.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_configuring_the_webapp">Configuring the Webapp</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>When running an Isis webapp, configuration properties are read from configuration files held in the <code>WEB-INF</code> directory.</p>
+</div>
+<div class="sect2">
+<h3 id="_isis_configuration">Isis configuration</h3>
+<div class="paragraph">
+<p>The <code>WEBINF/isis.properties</code> file is always read and must exist.</p>
+</div>
+<div class="paragraph">
+<p>In addition, the following other properties are searched for and if present also read:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>viewer_wicket.properties</code> - if the Wicket UI (viewer) is in use</p>
+</li>
+<li>
+<p><code>viewer_restfulobjects.properties</code> - if the Restful Objects REST API (viewer) is in use</p>
+</li>
+<li>
+<p><code>viewer.properties</code> - for any shared UI configuration</p>
+</li>
+<li>
+<p><code>persistor_datanucleus.properties</code> - assuming the JDO/DataNucleus objectstore is in use</p>
+</li>
+<li>
+<p><code>persistor.properties</code> - for any shared objectstore configuration.  This typically is used to hold <code>JDBC</code> <code>URL</code>s</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_shiro_configuration">Shiro configuration</h3>
+<div class="paragraph">
+<p><code>WEB-INF/shiro.ini</code></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configuring_isis_to_use_shiro">Configuring Isis to use Shiro</h3>
+<div class="paragraph">
+<p>For more on some specific use cases, see <a href="#_configuring_shiro">Configuring Shiro</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_jdo_datanucleus_configuration">JDO/DataNucleus configuration</h3>
+<div class="paragraph">
+<p>Any Isis properties with the prefix <code>isis.persistor.datanucleus.impl</code> are passed through directly to the JDO/DataNucleus objectstore (with the prefix stripped off, of course).</p>
+</div>
+<div class="paragraph">
+<p>DataNucleus will itself search for additional XML mapping files, eg <code>mappings.jdo</code>.  These an be used to override any annotations of annotated entities.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_configuring_the_integration_tests">Configuring the Integration Tests</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Integration tests are configured programmatically, with a default set of properties to bootstrap the JDO/DataNucleus objectstore using an HSQLDB in-memory database.</p>
+</div>
+<div class="paragraph">
+<p>These can be overridden by subclassing <code>IsisConfigurationForJdoIntegTests</code>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_isis_configuration_properties">Isis Configuration Properties</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_deployment_types">Deployment Types</h3>
+
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_configuring_shiro">Configuring Shiro</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_configuring_shiro_to_use_ldap">Configuring Shiro to use LDAP</h3>
+
+</div>
+<div class="sect2">
+<h3 id="_format_of_isis_permissions">Format of Isis Permissions</h3>
+
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_configuring_datanucleus">Configuring DataNucleus</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_persistence_xml_file">persistence.xml file</h3>
+
+</div>
+<div class="sect2">
+<h3 id="_eagerly_registering_entity_types">Eagerly Registering Entity Types</h3>
+
+</div>
+<div class="sect2">
+<h3 id="_disabling_persistence_by_reachability">Disabling persistence-by-reachability</h3>
+
+</div>
+<div class="sect2">
+<h3 id="_transaction_management">Transaction Management</h3>
+
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_deployment">Deployment</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_externalized_configuration">Externalized Configuration</h3>
+
+</div>
+<div class="sect2">
+<h3 id="_jvm_args">JVM Args</h3>
+
+</div>
+<div class="sect2">
+<h3 id="_using_a_jndi_datasource">Using a JNDI Datasource</h3>
+
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_nosql_support">NoSQL Support</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_deploying_on_the_google_app_engine">Deploying on the Google App Engine</h3>
+
+</div>
+<div class="sect2">
+<h3 id="_using_neo4j">Using Neo4J</h3>
+
+</div>
+</div>
+</div>
+
+        </div>
+
+
+
+        <hr>
+
+        <footer>
+
+          <p class="small">
+
+          Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
+
+          <br/>
+
+          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
+
+          </p>
+
+        </footer>
+
+
+
+    </div>
+
+
+
+    <div class="large-4 medium-4 columns">
+
+        <!-- the 'hide' class is removed by Javascript -->
+
+        <div id="toc" class="toc2 hide">
+
+          <ul class="sectlevel1">
+<li><a href="#_configuration_files">Configuration Files</a></li>
+<li><a href="#_configuring_the_webapp">Configuring the Webapp</a>
+<ul class="sectlevel2">
+<li><a href="#_isis_configuration">Isis configuration</a></li>
+<li><a href="#_shiro_configuration">Shiro configuration</a></li>
+<li><a href="#_configuring_isis_to_use_shiro">Configuring Isis to use Shiro</a></li>
+<li><a href="#_jdo_datanucleus_configuration">JDO/DataNucleus configuration</a></li>
+</ul>
+</li>
+<li><a href="#_configuring_the_integration_tests">Configuring the Integration Tests</a></li>
+<li><a href="#_isis_configuration_properties">Isis Configuration Properties</a>
+<ul class="sectlevel2">
+<li><a href="#_deployment_types">Deployment Types</a></li>
+</ul>
+</li>
+<li><a href="#_configuring_shiro">Configuring Shiro</a>
+<ul class="sectlevel2">
+<li><a href="#_configuring_shiro_to_use_ldap">Configuring Shiro to use LDAP</a></li>
+<li><a href="#_format_of_isis_permissions">Format of Isis Permissions</a></li>
+</ul>
+</li>
+<li><a href="#_configuring_datanucleus">Configuring DataNucleus</a>
+<ul class="sectlevel2">
+<li><a href="#_persistence_xml_file">persistence.xml file</a></li>
+<li><a href="#_eagerly_registering_entity_types">Eagerly Registering Entity Types</a></li>
+<li><a href="#_disabling_persistence_by_reachability">Disabling persistence-by-reachability</a></li>
+<li><a href="#_transaction_management">Transaction Management</a></li>
+</ul>
+</li>
+<li><a href="#_deployment">Deployment</a>
+<ul class="sectlevel2">
+<li><a href="#_externalized_configuration">Externalized Configuration</a></li>
+<li><a href="#_jvm_args">JVM Args</a></li>
+<li><a href="#_using_a_jndi_datasource">Using a JNDI Datasource</a></li>
+</ul>
+</li>
+<li><a href="#_nosql_support">NoSQL Support</a>
+<ul class="sectlevel2">
+<li><a href="#_deploying_on_the_google_app_engine">Deploying on the Google App Engine</a></li>
+<li><a href="#_using_neo4j">Using Neo4J</a></li>
+</ul>
+</li>
+</ul>
+
+        </div>
+
+    </div>
+
+</div>
+
+
+
+
+
+    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+
+    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+
+
+
+
+
+<script type="text/javascript">
+
+      $(document).foundation();
+
+
+
+      $(document).ready(function(){
+
+        // Cache selectors
+
+        var lastId,
+
+            topMenu = $("div#toc ul"),
+
+            topMenuHeight = 70,
+
+
+
+            menuItems = topMenu.find("a"),
+
+            menuItemsHrefs = menuItems.map(function(){
+
+              var item = $($(this).attr("href"));
+
+              if (item.length) { return item; }
+
+            });
+
+
+
+        // Bind click handler to menu items to scroll animation
+
+        menuItems.click(function(e){
+
+          var href = $(this).attr("href"),
+
+              offsetTop = href === "#" ? 0 : $(href).offset().top-topMenuHeight+1;
+
+          $('html, body').stop().animate({
+
+              scrollTop: offsetTop
+
+          }, 300);
+
+
+
+          e.preventDefault();
+
+        });
+
+
+
+        // Bind to scroll of window
+
+        $(  window ).scroll(function(){
+
+
+
+           // Get container scroll position
+
+           var fromTop = $(this).scrollTop()+topMenuHeight;
+
+
+
+           var cur = menuItemsHrefs.map(function(){
+
+             if ($(this).offset().top < fromTop)
+
+               return this;
+
+           });
+
+
+
+           // Get the id of the current element
+
+           cur = cur[cur.length-1];
+
+
+
+           var id = cur && cur.length ? cur[0].id : "";
+
+
+
+           //console.log("id = " + id + ", lastId = "  + lastId);
+
+
+
+           if (lastId !== id && id) {
+
+               scrollTo(id);
+
+           }
+
+        });
+
+
+
+        scrollTo = function(id) {
+
+              lastId = id;
+
+
+
+              menuItems
+
+                .removeClass("active");
+
+
+
+              menuItems
+
+                .parents()
+
+                .removeClass("active-region");
+
+
+
+              menuItems
+
+                .parents("ul").hide();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .addClass("active");
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parents("ul").show();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parent().children("ul").show();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parents("li").addClass("active-region");
+
+
+
+        }
+
+      menuItems
+
+        .removeClass("active");
+
+
+
+      menuItems
+
+        .parents()
+
+        .removeClass("active-region");
+
+
+
+        var syncMenuItem;
+
+        if(window.location.hash!=="") {
+
+            var menuItemFor = $.grep(menuItems, function(e) {
+
+                return e.hash === window.location.hash;
+
+            });
+
+            console.log(menuItemFor);
+
+            if(menuItemFor.length === 1) {
+
+                syncMenuItem = menuItemFor[0];
+
+            }
+
+        }
+
+
+
+        if(!syncMenuItem){
+
+            syncMenuItem = menuItems[0];
+
+        }
+
+
+
+        $("#toc").removeClass("hide");
+
+
+
+        $(syncMenuItem).click();
+
+
+
+      });
+
+
+
+
+
+</script>
+
+
+
+
+
+</body>
+
+</html>
\ No newline at end of file

Added: websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-apache-isis-vs.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-apache-isis-vs.html (added)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-apache-isis-vs.html Wed Apr 15 21:40:06 2015
@@ -0,0 +1,813 @@
+<!doctype html>
+
+<html class="no-js" lang="en">
+
+<head>
+
+    <meta charset="utf-8"/>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+
+
+    <title>User Guide: Core Concepts: Apache Isis vs &#8230;&#8203;</title>
+
+
+
+    <!--
+
+        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 caching headers -->
+
+    <meta http-equiv="cache-control" content="no-cache" />
+
+    <meta http-equiv="pragma" content="no-cache" />
+
+    <meta http-equiv="expires" content="-1" />
+
+
+
+
+
+    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+
+    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
+
+
+
+    <link href="../css/asciidoctor/stylesheets/foundation-potion.css" rel="stylesheet">
+
+
+
+    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+
+
+
+    <style type="text/css">
+
+        #forkongithub a{
+
+            display: none;
+
+            background:#090;
+
+            color:#fff;
+
+            text-decoration:none;
+
+            font-family:arial, sans-serif;
+
+            text-align:center;
+
+            font-weight:bold;
+
+            padding:5px 40px;
+
+            font-size:1rem;
+
+            line-height:2rem;
+
+            position:relative;
+
+            transition:0.5s;
+
+        }
+
+        #forkongithub a:hover{
+
+            background:#0D0;
+
+            color:#fff;
+
+        }
+
+        #forkongithub a::before,
+
+        #forkongithub a::after{
+
+            content:"";width:100%;
+
+            display:block;
+
+            position:fixed;
+
+            top:1px;
+
+            left:0;
+
+            height:1px;
+
+            background:#fff;
+
+            z-index: 9999;
+
+        }
+
+        #forkongithub a::after{
+
+            bottom:1px;
+
+            top:auto;
+
+        }
+
+        @media screen and (min-width:768px){
+
+            #forkongithub{
+
+                position:fixed;
+
+                display:block;
+
+                top:0;
+
+                right:0;
+
+                width:250px;
+
+                overflow:hidden;
+
+                height:250px;
+
+                z-index: 9999;
+
+            }
+
+            #forkongithub a{
+
+                display:inherit;
+
+                width:250px;
+
+                position:fixed;
+
+                font-size:small;
+
+                top:40px;
+
+                right:-60px;
+
+                transform:rotate(45deg);
+
+                -webkit-transform:rotate(45deg);
+
+                -ms-transform:rotate(45deg);
+
+                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+
+            }
+
+        }
+
+    </style>
+
+
+
+    <style>
+
+        body {
+
+          position: relative;
+
+        }
+
+
+
+        body div#toc li,
+
+        body div#toc2 li {
+
+            list-style-type: none;
+
+        }
+
+
+
+        div#doc-content {
+
+            margin-top: 30px;
+
+        }
+
+
+
+        body div#toc li.active-region:before,
+
+        body div#toc2 li.active-region:before {
+
+            content: "\00BB \0020";
+
+            margin-left: -12px;
+
+        }
+
+
+
+        body div#toc li a.active,
+
+        body div#toc2 li a.active {
+
+            color: red;
+
+        }
+
+
+
+        body div#toc.toc,
+
+        body div#toc.toc2 {
+
+            position: fixed;
+
+            left: auto;
+
+            padding-top: 120px;
+
+            z-index: auto;
+
+            background-color: white;
+
+            border-left-color: #eee;
+
+            border-left-style: solid;
+
+            border-right: none;
+
+        }
+
+    </style>
+
+
+
+</head>
+
+<body>
+
+
+
+    <span id="forkongithub">
+
+        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+
+    </span>
+
+
+
+<div class="row">
+
+
+
+    <div class="fixed contain-to-grid">
+
+        <nav class="top-bar" data-topbar role="navigation">
+
+            <ul class="title-area">
+
+                <li class="name">
+
+                    <h1>
+
+                        <a href="/index.html">Apache Isis&trade;</a>
+
+                    </h1>
+
+                </li>
+
+                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+
+                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+
+            </ul>
+
+
+
+            <section class="top-bar-section">
+
+                <ul class="right">
+
+
+
+                    <li class="has-form">
+
+                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+
+                        <div class="row collapse">
+
+                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+
+                            <INPUT type="hidden" name="cof" value="FORID:0">
+
+                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
+
+                        </div>
+
+                    </FORM>
+
+                     </li>
+
+
+
+                </ul>
+
+
+
+                <!-- Left Nav Section -->
+
+                <ul class="left">
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#" >Demos</b></a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
+
+                        <li><a href="/intro/tutorials/screencasts.html">Screencasts&nbsp;<img src="/images/tv_show-25.png"></a></li>
+
+                        <li><a href="/intro/powered-by/powered-by.html">Powered by</a></li>
+
+                        <li><a href="http://isisdemo.mmyco.co.uk/" target="_blank">Online Demo</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li><a href="/documentation">Documentation</a></li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#">Downloads</a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/intro/getting-started/simpleapp-archetype.html">Isis (Maven archetype)</a></li>
+
+                        <li><a href="/download.html">Isis (downloads)</a></li>
+
+                        <li><a href="http://www.isisaddons.org" target="_blank">Isis Add-ons (not ASF)</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#">Help</a>
+
+                      <ul class="dropdown">
+
+                        <li><a href="/support.html">Mailing Lists</a></li>
+
+                        <li><a href="http://isis.markmail.org/search/?q=" target="_blank">Mailing List Archives</a></li>
+
+                        <li><a href="https://issues.apache.org/jira/browse/ISIS" target="_blank">JIRA</a></li>
+
+                        <li><a href="http://github.com/apache/isis" target="_blank">Github mirror</a></li>
+
+                        <li><a href="http://stackoverflow.com/questions/tagged/isis" target="_blank">Stack Overflow</a></li>
+
+                        <li><a href="/contributors/contributing.html">How to contribute</a></li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                    <li class="has-dropdown">
+
+                      <a href="#" >@ASF</a>
+
+                      <ul class="dropdown">
+
+                        <li>
+
+                          <a href="http://www.apache.org/" target="_blank">Apache Homepage <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/licenses/" target="_blank">Licenses <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/security/" target="_blank">Security <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                        <li>
+
+                          <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">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>
+
+                        <li>
+
+                          <a href="{{base}}more-thanks.html">More thanks <i class="icon-share-alt"></i></a>
+
+                        </li>
+
+                      </ul>
+
+                    </li>
+
+
+
+                </ul>
+
+
+
+            </section>
+
+        </nav>
+
+    </div>
+
+</div>
+
+
+
+<div class="row">
+
+    <div class="large-8 medium-8 columns">
+
+
+
+        <div id="doc-content">
+
+          <div id="preamble">
+<div class="sectionbody">
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+TODO
+</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_vs_spring">vs Spring</h2>
+<div class="sectionbody">
+
+</div>
+</div>
+<div class="sect1">
+<h2 id="_vs_jee">vs JEE</h2>
+<div class="sectionbody">
+
+</div>
+</div>
+<div class="sect1">
+<h2 id="_vs_grails">vs Grails</h2>
+<div class="sectionbody">
+
+</div>
+</div>
+<div class="sect1">
+<h2 id="_vs_angular">vs Angular</h2>
+<div class="sectionbody">
+
+</div>
+</div>
+
+        </div>
+
+
+
+        <hr>
+
+        <footer>
+
+          <p class="small">
+
+          Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
+
+          <br/>
+
+          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
+
+          </p>
+
+        </footer>
+
+
+
+    </div>
+
+
+
+    <div class="large-4 medium-4 columns">
+
+        <!-- the 'hide' class is removed by Javascript -->
+
+        <div id="toc" class="toc2 hide">
+
+          <ul class="sectlevel1">
+<li><a href="#_vs_spring">vs Spring</a></li>
+<li><a href="#_vs_jee">vs JEE</a></li>
+<li><a href="#_vs_grails">vs Grails</a></li>
+<li><a href="#_vs_angular">vs Angular</a></li>
+</ul>
+
+        </div>
+
+    </div>
+
+</div>
+
+
+
+
+
+    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+
+    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+
+
+
+
+
+<script type="text/javascript">
+
+      $(document).foundation();
+
+
+
+      $(document).ready(function(){
+
+        // Cache selectors
+
+        var lastId,
+
+            topMenu = $("div#toc ul"),
+
+            topMenuHeight = 70,
+
+
+
+            menuItems = topMenu.find("a"),
+
+            menuItemsHrefs = menuItems.map(function(){
+
+              var item = $($(this).attr("href"));
+
+              if (item.length) { return item; }
+
+            });
+
+
+
+        // Bind click handler to menu items to scroll animation
+
+        menuItems.click(function(e){
+
+          var href = $(this).attr("href"),
+
+              offsetTop = href === "#" ? 0 : $(href).offset().top-topMenuHeight+1;
+
+          $('html, body').stop().animate({
+
+              scrollTop: offsetTop
+
+          }, 300);
+
+
+
+          e.preventDefault();
+
+        });
+
+
+
+        // Bind to scroll of window
+
+        $(  window ).scroll(function(){
+
+
+
+           // Get container scroll position
+
+           var fromTop = $(this).scrollTop()+topMenuHeight;
+
+
+
+           var cur = menuItemsHrefs.map(function(){
+
+             if ($(this).offset().top < fromTop)
+
+               return this;
+
+           });
+
+
+
+           // Get the id of the current element
+
+           cur = cur[cur.length-1];
+
+
+
+           var id = cur && cur.length ? cur[0].id : "";
+
+
+
+           //console.log("id = " + id + ", lastId = "  + lastId);
+
+
+
+           if (lastId !== id && id) {
+
+               scrollTo(id);
+
+           }
+
+        });
+
+
+
+        scrollTo = function(id) {
+
+              lastId = id;
+
+
+
+              menuItems
+
+                .removeClass("active");
+
+
+
+              menuItems
+
+                .parents()
+
+                .removeClass("active-region");
+
+
+
+              menuItems
+
+                .parents("ul").hide();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .addClass("active");
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parents("ul").show();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parent().children("ul").show();
+
+
+
+              menuItems
+
+                .filter("[href=#"+id+"]")
+
+                .parents("li").addClass("active-region");
+
+
+
+        }
+
+      menuItems
+
+        .removeClass("active");
+
+
+
+      menuItems
+
+        .parents()
+
+        .removeClass("active-region");
+
+
+
+        var syncMenuItem;
+
+        if(window.location.hash!=="") {
+
+            var menuItemFor = $.grep(menuItems, function(e) {
+
+                return e.hash === window.location.hash;
+
+            });
+
+            console.log(menuItemFor);
+
+            if(menuItemFor.length === 1) {
+
+                syncMenuItem = menuItemFor[0];
+
+            }
+
+        }
+
+
+
+        if(!syncMenuItem){
+
+            syncMenuItem = menuItems[0];
+
+        }
+
+
+
+        $("#toc").removeClass("hide");
+
+
+
+        $(syncMenuItem).click();
+
+
+
+      });
+
+
+
+
+
+</script>
+
+
+
+
+
+</body>
+
+</html>
\ No newline at end of file