http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/ugbtb/runtime/web-xml/parts.pptx
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb/runtime/web-xml/parts.pptx 
b/content/guides/ugbtb/runtime/web-xml/parts.pptx
deleted file mode 100644
index 59c1eeb..0000000
Binary files a/content/guides/ugbtb/runtime/web-xml/parts.pptx and /dev/null 
differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/ugbtb/runtime/web-xml/ro-only.png
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb/runtime/web-xml/ro-only.png 
b/content/guides/ugbtb/runtime/web-xml/ro-only.png
deleted file mode 100644
index c96135c..0000000
Binary files a/content/guides/ugbtb/runtime/web-xml/ro-only.png and /dev/null 
differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/ugbtb/runtime/web-xml/wicket-and-ro.png
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb/runtime/web-xml/wicket-and-ro.png 
b/content/guides/ugbtb/runtime/web-xml/wicket-and-ro.png
deleted file mode 100644
index b8a2d05..0000000
Binary files a/content/guides/ugbtb/runtime/web-xml/wicket-and-ro.png and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/ugbtb/runtime/web-xml/wicket-only.png
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb/runtime/web-xml/wicket-only.png 
b/content/guides/ugbtb/runtime/web-xml/wicket-only.png
deleted file mode 100644
index 46070ce..0000000
Binary files a/content/guides/ugbtb/runtime/web-xml/wicket-only.png and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/ugbtb/ugbtb.html
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb/ugbtb.html b/content/guides/ugbtb/ugbtb.html
index d31ee2d..1e25a0f 100644
--- a/content/guides/ugbtb/ugbtb.html
+++ b/content/guides/ugbtb/ugbtb.html
@@ -179,6 +179,7 @@ table.CodeRay td.code>pre{padding:0}
         <li><a href="../../guides/ugfun/ugfun.html">Fundamentals</a></li> 
         <li><a href="../../guides/ugvw/ugvw.html">Wicket Viewer</a></li> 
         <li><a href="../../guides/ugvro/ugvro.html">Restful Objects 
Viewer</a></li> 
+        <li><a href="../../guides/ugodn/ugodn.html">DataNucleus Object 
Store</a></li> 
         <li><a href="../../guides/ugsec/ugsec.html">Security</a></li> 
         <li><a href="../../guides/ugtst/ugtst.html">Testing</a></li> 
         <li><a href="../../guides/ugbtb/ugbtb.html">Beyond the Basics</a></li> 
@@ -196,25 +197,32 @@ table.CodeRay td.code>pre{padding:0}
        </ul> </li> 
       <li class="dropdown  hidden-sm hidden-md"> <a href="#" 
class="dropdown-toggle" data-toggle="dropdown" role="button" 
aria-haspopup="true" aria-expanded="false">Downloads<span 
class="caret"></span></a> 
        <ul class="dropdown-menu"> 
-        <li><a href="../../downloads.html">Downloads</a></li> 
-        <li><a href="../../release-notes/release-notes.html">Release 
Notes</a></li> 
-        <li><a href="../../migration-notes/migration-notes.html">Migration 
Notes</a></li> 
-        <li role="separator" class="divider"></li> 
         <li class="dropdown-header">Maven archetypes</li> 
         <li><a 
href="../../guides/ugfun/ugfun.html#_ugfun_getting-started_helloworld-archetype">helloworld</a></li>
 
         <li><a 
href="../../guides/ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">simpleapp</a></li>
 
         <li role="separator" class="divider"></li> 
-        <li><a href="https://issues.apache.org/jira/browse/ISIS";>ASF 
JIRA</a></li> 
+        <li><a href="../../downloads.html">Downloads</a></li> 
+        <li><a href="../../release-notes/release-notes.html">Release 
Notes</a></li> 
+        <li><a href="../../migration-notes/migration-notes.html">Migration 
Notes</a></li> 
+        <li role="separator" class="divider"></li> 
         <li><a href="https://github.com/apache/isis";>Github mirror</a></li> 
        </ul> </li> 
       <li class="dropdown  hidden-sm"> <a href="#" class="dropdown-toggle" 
data-toggle="dropdown" role="button" aria-haspopup="true" 
aria-expanded="false">Support<span class="caret"></span></a> 
        <ul class="dropdown-menu"> 
-        <li><a href="../../support.html">Mailing lists</a></li> 
+        <li class="dropdown-header">Guides</li> 
+        <li><a href="../../guides/dg/dg.html">Developers' Guide</a></li> 
+        <li><a href="../../guides/cgcom/cgcom.html">Committers' Guide</a></li> 
+        <li><a href="../../guides/htg.html">Hints-n-Tips Guide</a></li> 
+        <li role="separator" class="divider"></li> 
+        <li class="dropdown-header">Mailing Lists</li> 
+        <li><a href="../../support.html">How to subscribe</a></li> 
         <li><a 
href="https://lists.apache.org/[email protected]";>Archives (ASF 
Pony mail)</a></li> 
         <li><a href="http://isis.markmail.org/search/?q=";>Archives 
(Markmail)</a></li> 
+        <li role="separator" class="divider"></li> 
+        <li class="dropdown-header">Other Resources</li> 
+        <li><a href="https://issues.apache.org/jira/browse/ISIS";>ASF 
JIRA</a></li> 
         <li><a href="http://stackoverflow.com/questions/tagged/isis";>Stack 
Overflow</a></li> 
-        <li><a href="../../guides/dg/dg.html">How to contribute</a></li> 
-        <li><a href="../../help.html">Other resources</a></li> 
+        <li><a href="../../help.html">Wiki, Fisheye etc.</a></li> 
        </ul> </li> 
       <li class="dropdown hidden-sm hidden-md"> <a href="#" 
class="dropdown-toggle" data-toggle="dropdown" role="button" 
aria-haspopup="true" aria-expanded="false">@ASF<span class="caret"></span></a> 
        <ul class="dropdown-menu"> 
@@ -1495,8 +1503,7 @@ 
log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false</
          <div class="listingblock"> 
           <div class="content"> 
            <pre class="CodeRay highlight"><code data-lang="java"><span 
class="annotation">@DomainService</span>(
-        nature = NatureOfService.DOMAIN,
-        menuOrder = <span class="string"><span class="delimiter">"</span><span 
class="content">1</span><span class="delimiter">"</span></span>                 
            <i class="conum" data-value="1"></i><b>(1)</b>
+        nature = NatureOfService.DOMAIN
 )
 <span class="directive">public</span> <span class="type">class</span> <span 
class="class">MyLocaleProvider</span> <span class="directive">implements</span> 
LocaleProvider {
     <span class="annotation">@Override</span>
@@ -1506,20 +1513,13 @@ 
log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false</
 }</code></pre> 
           </div> 
          </div> 
-         <div class="colist arabic"> 
-          <table> 
-           <tbody>
-            <tr> 
-             <td><i class="conum" data-value="1"></i><b>1</b></td> 
-             <td>takes precedence over the default implementation.</td> 
-            </tr> 
-           </tbody>
-          </table> 
-         </div> 
          <div class="paragraph"> 
           <p>The framework uses the value of the <code>menuOrder</code> 
attribute to determine priority; lowest number wins.</p> 
          </div> 
          <div class="paragraph"> 
+          <p>However, there is no need to specify the <code>menuOrder</code> 
attribute: its default value is now set to a lower value (specifically: 
<code>Integer.MAX_VALUE - 100</code>) than all of the framework-provided 
implementations, and thus always takes precedence.</p> 
+         </div> 
+         <div class="paragraph"> 
           <p>Thus, if a single instance is to be injected, eg:</p> 
          </div> 
          <div class="listingblock"> 
@@ -1543,20 +1543,6 @@ LocalProvider localeProvider;</code></pre>
          <div class="paragraph"> 
           <p>then all implementations will be present in the list, ordered by 
priority; your custom implementation will be first in the list.</p> 
          </div> 
-         <div class="paragraph"> 
-          <p>(As of <code>1.15.0</code> onwards), there is no need to specify 
the <code>menuOrder</code> attribute: its default value is now set to a lower 
value (specifically: <code>Integer.MAX_VALUE - 100</code>). Thus, the code 
simplifies to:</p> 
-         </div> 
-         <div class="listingblock"> 
-          <div class="content"> 
-           <pre class="CodeRay highlight"><code data-lang="java"><span 
class="annotation">@DomainService</span>(nature = NatureOfService.DOMAIN)
-<span class="directive">public</span> <span class="type">class</span> <span 
class="class">MyLocaleProvider</span> <span class="directive">implements</span> 
LocaleProvider {
-    <span class="annotation">@Override</span>
-    <span class="directive">public</span> <span 
class="predefined-type">Locale</span> getLocale() {
-        <span class="keyword">return</span> ...
-    }
-}</code></pre> 
-          </div> 
-         </div> 
          <div class="admonitionblock note"> 
           <table> 
            <tbody>
@@ -1810,7 +1796,7 @@ LocalProvider localeProvider;</code></pre>
           </div> 
          </div> 
          <div class="paragraph"> 
-          <p>Prior to 1.10.0 (when lifecycle events were introduced), this 
could also be be done by accessing the JDO API directly:</p> 
+          <p>It is also possible to accomplish this by accessing the JDO API 
directly:</p> 
          </div> 
          <div class="listingblock"> 
           <div class="content"> 
@@ -2805,19 +2791,6 @@ 
serviceRegistry.injectServicesInto(viewModel);</code></pre>
              </tbody>
             </table> 
            </div> 
-           <div class="admonitionblock note"> 
-            <table> 
-             <tbody>
-              <tr> 
-               <td class="icon"> <i class="fa icon-note" title="Note"></i> 
</td> 
-               <td class="content"> 
-                <div class="paragraph"> 
-                 <p>Previously (prior to <code>1.13.0</code>) the framework 
also supported the "isis.reflector.facets" configuration property, to specify a 
completely new implementation of the (internal API) 
<code>ProgrammingModel</code>. This is no longer supported; use 
"isis.reflector.facets.include" and "isis.reflector.facet.exclude" to adjust 
the framework’s default implementation (called 
<code>ProgrammingModelFacetsJava5</code>).</p> 
-                </div> </td> 
-              </tr> 
-             </tbody>
-            </table> 
-           </div> 
           </div> 
          </div> 
         </div> 
@@ -3823,10 +3796,7 @@ export 
ISIS_OPTS="isis.appManifest=domainapp.app.DomainAppAppManifestWithFixture
           </ul>
          </div> 
          <div class="paragraph"> 
-          <p>As of <code>1.8.0</code>, Apache Isis has experimental support 
for Neo4J, courtesy of DataNucleus' <a 
href="http://www.datanucleus.org/products/datanucleus/datastores/neo4j.html";>Neo4J
 Datastore</a> implementation.</p> 
-         </div> 
-         <div class="paragraph"> 
-          <p>The <a 
href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp 
archetype</a> has been updated so that they can be optionally run under 
Neo4J.</p> 
+          <p>Apache Isis has experimental support for Neo4J, courtesy of 
DataNucleus' <a 
href="http://www.datanucleus.org/products/datanucleus/datastores/neo4j.html";>Neo4J
 Datastore</a> implementation.</p> 
          </div> 
          <div class="admonitionblock tip"> 
           <table> 

Reply via email to