You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2018/01/18 11:08:08 UTC

svn commit: r1821482 [3/7] - in /jackrabbit/site/live/oak/docs: ./ architecture/ coldstandby/ features/ nodestore/ nodestore/document/ nodestore/segment/ oak-mongo-js/ oak_api/ plugins/ query/ security/ security/accesscontrol/ security/authentication/ ...

Modified: jackrabbit/site/live/oak/docs/nodestore/segmentmk.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/nodestore/segmentmk.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/nodestore/segmentmk.html (original)
+++ jackrabbit/site/live/oak/docs/nodestore/segmentmk.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20170502" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Segment Storage Design Overview</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,7 +63,6 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
-                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -105,7 +104,6 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +131,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -165,7 +163,6 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
-    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
@@ -198,7 +195,6 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -415,7 +411,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/oak-mongo-js/index.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/oak-mongo-js/index.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/oak-mongo-js/index.html (original)
+++ jackrabbit/site/live/oak/docs/oak-mongo-js/index.html Thu Jan 18 11:08:07 2018
@@ -56,7 +56,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Jan 10 2018 12:04:46 GMT-0000 (GMT)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Thu Jan 18 2018 12:06:35 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

Modified: jackrabbit/site/live/oak/docs/oak-mongo-js/oak-mongo.js.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/oak-mongo-js/oak-mongo.js.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/oak-mongo-js/oak-mongo.js.html (original)
+++ jackrabbit/site/live/oak/docs/oak-mongo-js/oak-mongo.js.html Thu Jan 18 11:08:07 2018
@@ -1105,7 +1105,7 @@ var oak = (function(global){
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Jan 10 2018 12:04:46 GMT-0000 (GMT)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Thu Jan 18 2018 12:06:35 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

Modified: jackrabbit/site/live/oak/docs/oak-mongo-js/oak.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/oak-mongo-js/oak.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/oak-mongo-js/oak.html (original)
+++ jackrabbit/site/live/oak/docs/oak-mongo-js/oak.html Thu Jan 18 11:08:07 2018
@@ -4114,7 +4114,7 @@ is inactive.
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Jan 10 2018 12:04:46 GMT-0000 (GMT)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Thu Jan 18 2018 12:06:35 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

Modified: jackrabbit/site/live/oak/docs/oak_api/error_codes.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/oak_api/error_codes.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/oak_api/error_codes.html (original)
+++ jackrabbit/site/live/oak/docs/oak_api/error_codes.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20170502" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Error Codes</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,7 +63,6 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
-                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -105,7 +104,6 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +131,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -165,7 +163,6 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
-    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
@@ -198,7 +195,6 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -375,7 +371,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/oak_api/overview.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/oak_api/overview.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/oak_api/overview.html (original)
+++ jackrabbit/site/live/oak/docs/oak_api/overview.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-12-20 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20171220" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Oak API</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -105,7 +105,6 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +132,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-12-20<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -199,7 +198,6 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -336,7 +334,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/osgi_config.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/osgi_config.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/osgi_config.html (original)
+++ jackrabbit/site/live/oak/docs/osgi_config.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-11-28 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20171128" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Repository OSGi Configuration</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -105,7 +105,6 @@
             <li><a href="participating.html" title="Participating">Participating</a></li>
             <li><a href="developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +132,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-11-28<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -199,7 +198,6 @@
     <li><a href="participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -622,7 +620,7 @@ cacheSizeInMB=128
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/participating.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/participating.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/participating.html (original)
+++ jackrabbit/site/live/oak/docs/participating.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20170502" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Participating</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -63,7 +63,6 @@
               <ul class="dropdown-menu">
                   <li><a href="nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
-                  <li><a href="nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -105,7 +104,6 @@
             <li><a href="participating.html" title="Participating">Participating</a></li>
             <li><a href="developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +131,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -165,7 +163,6 @@
       </ul>
   </li>
     <li><a href="nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
-    <li><a href="nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
@@ -199,7 +196,6 @@
   </li>
     <li><a href="developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -248,7 +244,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/plugins/blobstore.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/plugins/blobstore.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/plugins/blobstore.html (original)
+++ jackrabbit/site/live/oak/docs/plugins/blobstore.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20170502" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; The Blob Store</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,7 +63,6 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
-                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -105,7 +104,6 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +131,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -165,7 +163,6 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
-    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li class="active"><a href="#"><span class="none"></span>Blob Storage</a>
@@ -199,7 +196,6 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -739,7 +735,7 @@ public class GetGCStats {
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/query/flags.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/flags.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/query/flags.html (original)
+++ jackrabbit/site/live/oak/docs/query/flags.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20170502" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Flags</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,7 +63,6 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
-                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -105,7 +104,6 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +131,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -165,7 +163,6 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
-    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
@@ -198,7 +195,6 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -252,7 +248,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/query/grammar-sql2.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/grammar-sql2.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/query/grammar-sql2.html (original)
+++ jackrabbit/site/live/oak/docs/query/grammar-sql2.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-18 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Oak SQL-2 Query Grammar</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -71,6 +71,8 @@
 <a href="../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="../query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="../query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="../query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="../query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="../query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -133,7 +135,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-18<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
@@ -172,6 +174,9 @@
     <li><a href="../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="../query/grammar-xpath.html" title="XPath Grammar"><span class="none"></span>XPath Grammar</a>  </li>
+    <li class="active"><a href="#"><span class="none"></span>SQL-2 Grammar</a>
+  </li>
     <li><a href="../query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="../query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="../query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -240,12 +245,35 @@
   
 <li><a href="#query">Query</a></li>
   
+<li><a href="#column">Column</a></li>
+  
+<li><a href="#selector">Selector</a></li>
+  
+<li><a href="#join">Join</a></li>
+  
+<li><a href="#constraint">Constraint</a></li>
+  
+<li><a href="#andCondition">And Condition</a></li>
+  
+<li><a href="#condition">Condition</a></li>
+  
+<li><a href="#comparison">Comparison</a></li>
+  
+<li><a href="#inComparison">In Comparison</a></li>
+  
+<li><a href="#staticOperand">Static Operand</a></li>
+  
+<li><a href="#ordering">Ordering</a></li>
+  
+<li><a href="#dynamicOperand">Dynamic Operand</a></li>
+  
 <li><a href="#options">Options</a></li>
   
 <li><a href="#explain">Explain</a></li>
   
 <li><a href="#measure">Measure</a></li>
 </ul>
+<hr />
 
 <div class="section" id="query">
 <h3 id="query">Query</h3>
@@ -262,6 +290,7 @@ SELECT [ DISTINCT&#xa0;] { * | { <a href
 <p>DISTINCT ensures each row is only returned once.</p>
 <p>UNION combines the result of this query with the results of another query, where UNION ALL does not remove duplicates.</p>
 <p>ORDER BY may use an index. If there is no index for the given sort order, then the result is fully read in memory and sorted before returning the first row.</p>
+<hr />
 </div></div>
 <div class="section" id="column">
 <h3 id="column">Column</h3>
@@ -274,6 +303,7 @@ SELECT [ DISTINCT&#xa0;] { * | { <a href
 <br /> | rep:spellcheck()
 <br /> } [ AS aliasName ]
 </h4>
+<hr />
 </div></div>
 <div class="section" id="selector">
 <h3 id="selector">Selector</h3>
@@ -283,72 +313,89 @@ SELECT [ DISTINCT&#xa0;] { * | { <a href
 nodeTypeName [ AS selectorName ]
 </h4>
 <p>The nodetype name can be either a primary nodetype or a mixin nodetype.</p>
+<hr />
 </div></div>
 <div class="section" id="join">
 <h3 id="join">Join</h3>
 
 <div class="section">
 <h4><a name="a_INNER___LEFT__RIGHT__OUTER__JOIN_rightSelector_ON__selectorName_._propertyName__joinSelectorName_._joinPropertyName____ISSAMENODE_selectorName__joinSelectorName___selectorPathName______ISCHILDNODE_childSelectorName__parentSelectorName_____ISDESCENDANTNODE_descendantSelectorName__ancestorSelectorName__"></a>
-{ INNER | { LEFT | RIGHT } OUTER } JOIN rightSelector ON
+{ INNER | { LEFT | RIGHT } OUTER } JOIN <a href="#selector">rightSelector</a> ON
 <br /> { selectorName . propertyName = joinSelectorName . joinPropertyName }
 <br /> | { ISSAMENODE( selectorName , joinSelectorName [ , selectorPathName ] ) }
 <br /> | { ISCHILDNODE( childSelectorName , parentSelectorName ) }
 <br /> | { ISDESCENDANTNODE( descendantSelectorName , ancestorSelectorName ) }
 </h4>
 <p>An inner join only returns entries if nodes are found on both the left and right selector. A left outer join will return entries that don&#x2019;t have matching nodes on the right selector. A right outer join will return entries that don&#x2019;t have matching nodes on the left selector. For outer joins, all the properties of the selector that doesn&#x2019;t have a matching node are null.</p>
+<hr />
 </div></div>
 <div class="section" id="constraint">
 <h3 id="constraint">Constraint</h3>
 
 <div class="section">
 <h4><a name="andCondition___OR_andCondition__..._"></a>
-andCondition [ { OR andCondition } [...] ]
+<a href="#andCondition">andCondition</a> [ { OR <a href="#andCondition">andCondition</a> } [...] ]
 </h4>
-<p>OR conditions of the form &#x201c;X = 1 OR X = 2&#x201d; are automatically converted to &#x201c;X IN(1, 2)&#x201d;.</p>
+<p>OR conditions of the form &#x201c;X = 1 OR X = 2&#x201d; are automatically converted to &#x201c;X IN(1, 2)&#x201d;, and can use the same an index.</p>
 <p>OR conditions of the form &#x201c;X = 1 OR Y = 2&#x201d; are more complicated. Oak will try two options: first, what is the expected cost to use a UNION query (one query with X = 1, and a second query with Y = 2). If using UNION results in a lower estimated cost, then UNION is used. This can be the case, for example, if there are two distinct indexes, one on X and another on Y.</p>
+<hr />
 </div></div>
 <div class="section" id="andCondition">
 <h3 id="andCondition">And Condition</h3>
 
 <div class="section">
 <h4><a name="condition___AND_condition__..._"></a>
-condition [ { AND condition } [...] ]
+<a href="#condition">condition</a> [ { AND <a href="#condition">condition</a> } [...] ]
 </h4>
 <p>A special case (not found in relational databases) is AND conditions of the form &#x201c;X = 1 AND X = 2&#x201d;. They will match nodes with multi-valued properties, where the property value contains both 1 and 2.</p>
+<hr />
 </div></div>
 <div class="section" id="condition">
 <h3 id="condition">Condition</h3>
 
 <div class="section">
-<h4><a name="comparison_inComparison__NOT_constraint___constraint____selectorName_.__propertyName_IS__NOT__NULL__CONTAINS____selectorName_.__propertyName____selectorName_._____fulltextSearchExpression____ISSAMENODE__ISCHILDNODE__ISDESCENDANTNODE_____selectorName___pathString___SIMILAR___selectorName_.___propertyName_____staticOperand___NATIVE___selectorName___language__staticOperand___SPELLCHECK___selectorName___staticOperand___SUGGEST___selectorName___staticOperand_"></a>
-comparison
-<br /> inComparison
-<br /> | NOT constraint
-<br /> | ( constraint )
+<h4><a name="comparison_inComparison__NOT_constraint___constraint____selectorName_.__propertyName_IS__NOT__NULL__CONTAINS____selectorName_.__propertyName____selectorName_._____staticOperand____ISSAMENODE__ISCHILDNODE__ISDESCENDANTNODE_____selectorName___pathString___SIMILAR___selectorName_.___propertyName_____staticOperand___NATIVE___selectorName___language__staticOperand___SPELLCHECK___selectorName___staticOperand___SUGGEST___selectorName___staticOperand_"></a>
+<a href="#comparison">comparison</a>
+<br /> <a href="#inComparison">inComparison</a>
+<br /> | NOT <a href="#constraint">constraint</a>
+<br /> | ( <a href="#constraint">constraint</a> )
 <br /> | [ selectorName . ] propertyName IS [ NOT ] NULL
-<br /> | CONTAINS( { { [ selectorName . ] propertyName } | { selectorName . * } } , fulltextSearchExpression )
+<br /> | CONTAINS( { { [ selectorName . ] propertyName } | { selectorName . * } } , staticOperand )
 <br /> | { ISSAMENODE | ISCHILDNODE | ISDESCENDANTNODE } (  [ selectorName , ] pathString )
 <br /> | SIMILAR ( [ selectorName . ] { propertyName | * } , staticOperand )
 <br /> | NATIVE ( [ selectorName , ] language , staticOperand )
 <br /> | SPELLCHECK ( [ selectorName , ] staticOperand )
 <br /> | SUGGEST ( [ selectorName , ] staticOperand )
 </h4>
+<p>NOT conditions can not typically use an index.</p>
+<p>CONTAINS: see <a href="query-engine.html#Full-Text_Queries">Full-Text Queries</a>.</p>
+<p>SIMILAR: see <a href="query-engine.html#Similarity_Queries">Similarity Queries</a>.</p>
+<p>NATIVE: see <a href="query-engine.html#Native_Queries">Native Queries</a>.</p>
+<p>SPELLCHECK: see <a href="query-engine.html#Spellchecking">Spellchecking</a>.</p>
+<p>SUGGEST: see <a href="query-engine.html#Suggestions">Suggestions</a>.</p>
+<hr />
 </div></div>
 <div class="section" id="comparison">
 <h3 id="comparison">Comparison</h3>
 
 <div class="section">
 <h4><a name="dynamicOperand______________LIKE__staticOperand"></a>
-dynamicOperand { = | &lt;&gt; | &lt; | &lt;= | &gt; | &gt;= | LIKE } staticOperand
-</h4>
+<a href="#dynamicOperand">dynamicOperand</a> 
+{ = | &lt;&gt; | &lt; | &lt;= | &gt; | &gt;= | LIKE } 
+<a href="#staticOperand">staticOperand</a>
+</h4>
+<p>LIKE: when comparing with LIKE, the wildcards characters are _ (any one character) and % (any characters). An index is used, except if the operand starts with a wildcard. To search for the characters % and _, the characters need to be escaped using \ (backslash).</p>
+<p>Comparison using &lt;, &gt;, &gt;=, and &lt;= can use an index if the property in the index is ordered.</p>
+<hr />
 </div></div>
 <div class="section" id="inComparison">
 <h3 id="inComparison">In Comparison</h3>
 
 <div class="section">
 <h4><a name="dynamicOperand_IN__staticOperand__..._"></a>
-dynamicOperand IN ( staticOperand [, ...] )
+<a href="#dynamicOperand">dynamicOperand</a> IN ( <a href="#staticOperand">staticOperand</a> [, ...] )
 </h4>
+<hr />
 </div></div>
 <div class="section" id="staticOperand">
 <h3 id="staticOperand">Static Operand</h3>
@@ -371,16 +418,21 @@ literal
 <br />&#160;&#160; | WEAKREFERENCE 
 <br />&#160;&#160; | URI } )
 </h4>
+<p>A string (text) literal starts and ends with a single quote. Two single quotes can be used to create a single quote inside a string.</p>
+<p>Example:</p>
+<p>&#x2018;John&#x2019;&#x2018;s car&#x2019;</p>
+<hr />
 </div></div>
 <div class="section" id="ordering">
 <h3 id="ordering">Ordering</h3>
 
 <div class="section">
 <h4><a name="dynamicOperand__ASC__DESC_"></a>
-dynamicOperand [ ASC | DESC ]
+<a href="#dynamicOperand">dynamicOperand</a> [ ASC | DESC ]
 </h4>
 <p>Ordering by an indexed property will use that index if possible. If there is no index that can be used for the given sort order, then the result is fully read in memory and sorted there.</p>
 <p>As a special case, sorting by &#x201c;jcr:score&#x201d; in descending order is ignored (removed from the list), as this is what the fulltext index does anyway (and if no fulltext index is used, then the score doesn&#x2019;t apply). If for some reason you want to enforce sorting by &#x201c;jcr:score&#x201d;, then you can use the workaround to order by &#x201c;LOWER([jcr:score]) DESC&#x201d;.</p>
+<hr />
 </div></div>
 <div class="section" id="dynamicOperand">
 <h3 id="dynamicOperand">Dynamic Operand</h3>
@@ -397,6 +449,7 @@ dynamicOperand [ ASC | DESC ]
 <p>The selector name is only needed if the query contains multiple selectors.</p>
 <p>COALESCE: this returns the first operand if it is not null, and the second operand otherwise. <tt>@since Oak 1.8</tt></p>
 <p>PROPERTY: This feature is rarely used. It allows to filter for all properties with a given type. Example: the condition <tt>PROPERTY(*, Reference) = $uuid</tt> will search for any property of type <tt>Reference</tt>.</p>
+<hr />
 </div></div>
 <div class="section" id="options">
 <h3 id="options">Options</h3>
@@ -410,6 +463,7 @@ OPTION( {
 </h4>
 <p>TRAVERSAL: by default, queries without index will log a warning, except if the configuration option <tt>QueryEngineSettings.failTraversal</tt> is changed The traversal option can be used to change the behavior of the given query: OK to not log a warning, WARN to log a warning, FAIL to fail the query, and DEFAULT to use the default setting.</p>
 <p>INDEX TAG: by default, queries will use the index with the lowest expected cost (as in relational databases). To only consider some of the indexes, add tags (a multi-valued String property) to the index(es) of choice, and specify this tag in the query.</p>
+<hr />
 </div></div>
 <div class="section" id="explain">
 <h3 id="explain">Explain Query</h3>
@@ -433,6 +487,7 @@ SELECT * FROM [nt:base] WHERE [jcr:uuid]
 cost: { &quot;nt:base&quot;: 2.0 } 
 </pre></div></div>
 <p>This means the property index named &#x201c;uuid&#x201d; is used for this query. The expected cost (roughly the number of uncached I/O operations) is 2.</p>
+<hr />
 </div></div>
 <div class="section" id="measure">
 <h3 id="measure">Measure</h3>

Modified: jackrabbit/site/live/oak/docs/query/grammar-xpath.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/grammar-xpath.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/query/grammar-xpath.html (original)
+++ jackrabbit/site/live/oak/docs/query/grammar-xpath.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-18 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20180118" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Oak XPath Query Grammar</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -71,6 +71,8 @@
 <a href="../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="../query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="../query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="../query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="../query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="../query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -133,7 +135,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-18<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
@@ -172,6 +174,9 @@
     <li><a href="../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li class="active"><a href="#"><span class="none"></span>XPath Grammar</a>
+  </li>
+    <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar"><span class="none"></span>SQL-2 Grammar</a>  </li>
     <li><a href="../query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="../query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="../query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -235,67 +240,188 @@
    limitations under the License.
   --><div class="section">
 <h2><a name="Oak_XPath_Query_Grammar"></a>Oak XPath Query Grammar</h2>
-<div class="section">
-<h3><a name="XPath"></a>XPath</h3>
-
-<ul>
-  
-<li></li>
-</ul></div>
-<div class="section">
-<h3><a name="SQL-2"></a>SQL-2</h3>
 
 <ul>
   
 <li><a href="#query">Query</a></li>
   
+<li><a href="#filter">Filter</a></li>
+  
+<li><a href="#constraint">Constraint</a></li>
+  
+<li><a href="#andCondition">And Condition</a></li>
+  
+<li><a href="#condition">Condition</a></li>
+  
+<li><a href="#comparison">Comparison</a></li>
+  
+<li><a href="#staticOperand">Static Operand</a></li>
+  
+<li><a href="#ordering">Ordering</a></li>
+  
+<li><a href="#dynamicOperand">Dynamic Operand</a></li>
+  
+<li><a href="#options">Options</a></li>
+  
 <li><a href="#explain">Explain</a></li>
   
 <li><a href="#measure">Measure</a></li>
 </ul>
-</div>
+<hr />
+
 <div class="section" id="query">
 <h3 id="query">Query</h3>
 
 <div class="section">
-<h4><a name="SELECT__DISTINCT_____column___...____FROM__selector__join_...____WHERE_constraint___UNION__ALLquery___ORDER_BY__ordering___..._____queryOptions_"></a>
-SELECT [ DISTINCT&#xa0;] { * | { <a href="#column">column</a> [ , ... ] } }
-<br /> FROM { <a href="#selector">selector</a> [ <a href="#join">join</a> ... ] }
-<br /> [ WHERE <a href="#constraint">constraint</a> ]
-<br /> [ UNION [ ALL&#xa0;]&#xa0;<a href="#query">query</a> ]
-<br /> [ ORDER BY { <a href="#ordering">ordering</a> [ , ... ] } ]
+<h4><a name="ajcr:root__filter__...______column___...______order_by__ordering___..._____queryOptions_"></a>
+/jcr:root { <a href="#filter">filter</a> [ ... ] } }
+<br /> [ ( <a href="#column">column</a> [ | ... ] } ) ]
+<br /> [ order by { <a href="#ordering">ordering</a> [ , ... ] } ]
 <br /> [ <a href="#options">queryOptions</a> ]
 </h4>
-<p>DISTINCT ensures each row is only returned once.</p>
-<p>UNION combines the result of this query with the results of another query, where UNION ALL does not remove duplicate.</p>
-<p>ORDER BY may use an index. If there is no index for the given sort order, then the result is fully read in memory and sorted before returning the first row.</p>
+<p>&#x201c;order by&#x201d; may use an index. If there is no index for the given sort order, then the result is fully read in memory and sorted before returning the first row.</p>
+<p>The column list only needs to contain non-standard columns, such as &#x201c;rep:excerpt&#x201d; or &#x201c;rep:spellcheck&#x201d;. All properties of the node are returned in any case.</p>
+<p>The &#x201c;/jcr:root&#x201d; means the root node. It is recommended that all XPath queries start with this term.</p>
+<hr />
+</div></div>
+<div class="section" id="filter">
+<h3 id="filter">Filter</h3>
+
+<div class="section">
+<h4><a name="a_directChildNodeFilter___descendantNodeFilter__element____nodeName___nodeType______constraint_"></a>
+/ <a href="#filter">directChildNodeFilter</a>
+<br /> | // <a href="#filter">descendantNodeFilter</a>
+<br /> | element( [ * | nodeName ] [, nodeType] )
+<br /> | *
+<br /> | '[' <a href="#constraint">constraint</a> ']'
+</h4>
+<hr />
+</div></div>
+<div class="section" id="constraint">
+<h3 id="constraint">Constraint</h3>
+
+<div class="section">
+<h4><a name="andCondition___or_andCondition__..._"></a>
+<a href="#andCondition">andCondition</a> [ { or <a href="#andCondition">andCondition</a> } [...] ]
+</h4>
+<p>&#x201c;or&#x201d; conditions of the form &#x201c;@x = 1 or @x = 2&#x201d; can use the same index.</p>
+<p>&#x201c;or&#x201d; conditions of the form &#x201c;@x = 1 or @y = 2&#x201d; are more complicated. Oak will convert them to a &#x201c;union&#x201d; query (one query with @x = 1, and a second query with @y = 2).</p>
+<hr />
+</div></div>
+<div class="section" id="andCondition">
+<h3 id="andCondition">And Condition</h3>
+
+<div class="section">
+<h4><a name="condition___and_condition__..._"></a>
+<a href="#condition">condition</a> [ { and <a href="#condition">condition</a> } [...] ]
+</h4>
+<p>A special case (not found in relational databases) is &#x201c;and&#x201d; conditions of the form &#x201c;@x = 1 and @x = 2&#x201d;. They will match nodes with multi-valued properties, where the property value contains both 1 and 2.</p>
+<hr />
+</div></div>
+<div class="section" id="condition">
+<h3 id="condition">Condition</h3>
+
+<div class="section">
+<h4><a name="comparison_inComparison___fn:not_constraint___constraint___jcr:contains___property__.____fulltextSearchExpression___jcr:like_dynamicOperand__staticOperand___rep:similar__propertyName__staticOperand___rep:native__language__staticOperand___rep:spellcheck__staticOperand___rep:suggest__staticOperand_"></a>
+<a href="#comparison">comparison</a>
+<br /> <a href="#inComparison">inComparison</a>
+<br /> | [ fn:not (<a href="#constraint">constraint</a>)
+<br /> | ( <a href="#constraint">constraint</a> )
+<br /> | jcr:contains( [ { property | . } , ] fulltextSearchExpression )
+<br /> | jcr:like( dynamicOperand , staticOperand )
+<br /> | rep:similar ( propertyName , staticOperand )
+<br /> | rep:native ( language , staticOperand )
+<br /> | rep:spellcheck ( staticOperand )
+<br /> | rep:suggest ( staticOperand )
+</h4>
+<p>&#x201c;fn:not&#x201d; conditions can not typically use an index.</p>
+<p>&#x201c;jcr:contains&#x201d;: see <a href="query-engine.html#Full-Text_Queries">Full-Text Queries</a>.</p>
+<p>&#x201c;jcr:like&#x201d;: the wildcards characters are _ (any one character) and % (any characters). An index is used, except if the operand starts with a wildcard. To search for the characters % and _, the characters need to be escaped using \ (backslash).</p>
+<p>&#x201c;rep:similar&#x201d;: see <a href="query-engine.html#Similarity_Queries">Similarity Queries</a>.</p>
+<p>&#x201c;rep:native&#x201d;: see <a href="query-engine.html#Native_Queries">Native Queries</a>.</p>
+<p>&#x201c;rep:spellcheck&#x201d;: see <a href="query-engine.html#Spellchecking">Spellchecking</a>.</p>
+<p>&#x201c;rep:suggest&#x201d;: see <a href="query-engine.html#Suggestions">Suggestions</a>.</p>
+<hr />
+</div></div>
+<div class="section" id="comparison">
+<h3 id="comparison">Comparison</h3>
+
+<div class="section">
+<h4><a name="dynamicOperand______________staticOperand"></a>
+<a href="#dynamicOperand">dynamicOperand</a> 
+{ = | &lt;&gt; | &lt; | &lt;= | &gt; | &gt;= } 
+<a href="#staticOperand">staticOperand</a>
+</h4>
+<p>Comparison using &lt;, &gt;, &gt;=, and &lt;= can use an index if the property in the index is ordered.</p>
+<hr />
+</div></div>
+<div class="section" id="staticOperand">
+<h3 id="staticOperand">Static Operand</h3>
+
+<div class="section">
+<h4><a name="literal___bindVariableName__xs:dateTime__literal_"></a>
+literal
+<br /> | $ bindVariableName
+<br /> | xs:dateTime ( literal )
+</h4>
+<p>A string (text) literal starts and ends with a single quote. Two single quotes can be used to create a single quote inside a string.</p>
+<p>Example:</p>
+<p>&#x2018;John&#x2019;&#x2018;s car&#x2019;</p>
+<hr />
+</div></div>
+<div class="section" id="ordering">
+<h3 id="ordering">Ordering</h3>
+
+<div class="section">
+<h4><a name="dynamicOperand__ascending__descending_"></a>
+<a href="#dynamicOperand">dynamicOperand</a> [ ascending | descending ]
+</h4>
+<p>Ordering by an indexed property will use that index if possible. If there is no index that can be used for the given sort order, then the result is fully read in memory and sorted there.</p>
+<p>As a special case, sorting by &#x201c;jcr:score&#x201d; in descending order is ignored (removed from the list), as this is what the fulltext index does anyway (and if no fulltext index is used, then the score doesn&#x2019;t apply). If for some reason you want to enforce sorting by &#x201c;jcr:score&#x201d;, then you can use the workaround to order by &#x201c;fn:lowercase(@jcr:score) descending&#x201d;.</p>
+<hr />
+</div></div>
+<div class="section" id="dynamicOperand">
+<h3 id="dynamicOperand">Dynamic Operand</h3>
+
+<div class="section">
+<h4><a name="a_relativePath____propertyName______fn:string-length__dynamicOperand______fn:name__fn:local-name____._____jcr:score______fn:lower-case__fn:upper-case___dynamicOperand____fn:coalesce__dynamicOperand1_dynamicOperand2_"></a>
+[ relativePath / ] { @propertyName | * }
+<br />  | fn:string-length ( dynamicOperand  )
+<br />  | { fn:name | fn:local-name } ( [ . ] )
+<br />  | jcr:score ( )
+<br />  | { fn:lower-case | fn:upper-case } ( dynamicOperand )
+<br />  | fn:coalesce ( dynamicOperand1, dynamicOperand2 )
+</h4>
+<p>The selector name is only needed if the query contains multiple selectors.</p>
+<p>&#x201c;fn:coalesce&#x201d;: this returns the first operand if it is not null, and the second operand otherwise. <tt>@since Oak 1.8</tt></p>
+<hr />
 </div></div>
 <div class="section" id="options">
 <h3 id="options">Options</h3>
 
 <div class="section">
-<h4><a name="OPTION___TRAVERSAL__OK__WARN__FAIL__DEFAULT____INDEX_TAG_tagName_____...__"></a>
-OPTION( { 
-<br />&#160;&#160; TRAVERSAL { OK | WARN | FAIL | DEFAULT } | 
-<br />&#160;&#160; INDEX TAG tagName 
+<h4><a name="option___traversal__ok__warn__fail__default____index_tag_tagName_____...__"></a>
+option( { 
+<br />&#160;&#160; traversal { ok | warn | fail | default } | 
+<br />&#160;&#160; index tag tagName 
 <br /> } [ , ... ] )
 </h4>
-<p>TRAVERSAL: by default, queries without index will log a warning, except if the configuration option <tt>QueryEngineSettings.failTraversal</tt> is changed The traversal option can be used to change the behavior of the given query: OK to not log a warning, WARN to log a warning, FAIL to fail the query, and DEFAULT to use the default setting.</p>
-<p>INDEX TAG: by default, queries will use the index with the lowest expected cost (as in relational databases). To only consider some of the indexes, add tags (a multi-valued String property) to the index(es) of choice, and specify this tag in the query.</p>
+<p>&#x201c;traversal&#x201d;: by default, queries without index will log a warning, except if the configuration option <tt>QueryEngineSettings.failTraversal</tt> is changed The traversal option can be used to change the behavior of the given query: &#x201c;ok&#x201d; to not log a warning, &#x201c;warn&#x201d; to log a warning, &#x201c;fail&#x201d; to fail the query, and &#x201c;default&#x201d; to use the default setting.</p>
+<p>&#x201c;index tag&#x201d;: by default, queries will use the index with the lowest expected cost (as in relational databases). To only consider some of the indexes, add tags (a multi-valued String property) to the index(es) of choice, and specify this tag in the query.</p>
+<hr />
 </div></div>
 <div class="section" id="explain">
 <h3 id="explain">Explain Query</h3>
 
 <div class="section">
-<h4><a name="EXPLAIN_MEASURE__query_"></a>
-EXPLAIN [MEASURE] { <a href="#query">query</a> }
+<h4><a name="explain_measure__query_"></a>
+explain [measure] { <a href="#query">query</a> }
 </h4>
-<p>Does not run the query, but only computes and returns the query plan. With EXPLAIN MEASURE, the expected cost is calculated as well. In both cases, the query result will only have one column called &#x2018;plan&#x2019;, and one row that contains the plan.</p>
+<p>Does not run the query, but only computes and returns the query plan. With &#x201c;explain measure&#x201d;, the expected cost is calculated as well. In both cases, the query result will only have one column called &#x2018;plan&#x2019;, and one row that contains the plan.</p>
 <p>Examples:</p>
 
 <div class="source">
-<div class="source"><pre class="prettyprint">EXPLAIN MEASURE 
-SELECT * FROM [nt:base] WHERE [jcr:uuid] = 1
+<div class="source"><pre class="prettyprint">exlplain measure /jcr:root//*[@jcr:uuid = 'x']
 </pre></div></div>
 <p>Result:</p>
 
@@ -305,20 +431,20 @@ SELECT * FROM [nt:base] WHERE [jcr:uuid]
 cost: { &quot;nt:base&quot;: 2.0 } 
 </pre></div></div>
 <p>This means the property index named &#x201c;uuid&#x201d; is used for this query. The expected cost (roughly the number of uncached I/O operations) is 2.</p>
+<hr />
 </div></div>
 <div class="section" id="measure">
 <h3 id="measure">Measure</h3>
 
 <div class="section">
-<h4><a name="MEASURE__query_"></a>
-MEASURE { <a href="#query">query</a> }
+<h4><a name="measure__query_"></a>
+measure { <a href="#query">query</a> }
 </h4>
 <p>Runs the query, but instead of returning the result, returns the number of rows traversed. The query result has two columns, one called &#x2018;selector&#x2019; and one called &#x2018;scanCount&#x2019;. The result has at least two rows, one that represents the total (selector set to &#x2018;query&#x2019;), and one per selector used in the query. </p>
 <p>Examples:</p>
 
 <div class="source">
-<div class="source"><pre class="prettyprint">MEASURE 
-SELECT * FROM [nt:base] WHERE [jcr:uuid] = 1
+<div class="source"><pre class="prettyprint">measure /jcr:root//*[@jcr:uuid = 'x']
 </pre></div></div>
 <p>Result:</p>
 

Added: jackrabbit/site/live/oak/docs/query/grammar.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/grammar.html?rev=1821482&view=auto
==============================================================================
--- jackrabbit/site/live/oak/docs/query/grammar.html (added)
+++ jackrabbit/site/live/oak/docs/query/grammar.html Thu Jan 18 11:08:07 2018
@@ -0,0 +1,346 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-12-19 
+ | Rendered using Apache Maven Fluido Skin 1.6
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20171219" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Jackrabbit Oak &#x2013; Oak Query Grammar</title>
+    <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
+    <link rel="stylesheet" href="../css/site.css" />
+    <link rel="stylesheet" href="../css/print.css" media="print" />
+      <script type="text/javascript" src="../js/apache-maven-fluido-1.6.min.js"></script>
+      </head>
+    <body class="topBarEnabled">
+                  <a href="https://github.com/apache/jackrabbit-oak">
+      <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+        src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
+        alt="Fork me on GitHub">
+    </a>
+      <div id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+        <div class="container-fluid">
+        <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+<a class="brand" href="../"  title="Oak logo"><img src="../oak_logo.png" alt="Oak logo" />
+</a>
+            <ul class="nav">
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Overview <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="../index.html" title="Jackrabbit Oak">Jackrabbit Oak</a></li>
+            <li><a href="../license.html" title="License">License</a></li>
+            <li><a href="../downloads.html" title="Downloads">Downloads</a></li>
+            <li><a href="../articles.html" title="Articles">Articles</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Concepts and Architecture <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="../architecture/overview.html" title="Overview">Overview</a></li>
+            <li><a href="../architecture/nodestate.html" title="The Node State Model">The Node State Model</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
+            <li><a href="../oak_api/overview.html" title="Oak API">Oak API</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Features and Plugins <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li class="dropdown-submenu">
+<a href="../nodestore/overview.html" title="Node Storage">Node Storage</a>
+              <ul class="dropdown-menu">
+                  <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
+                  <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
+              </ul>
+            </li>
+            <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
+            <li class="dropdown-submenu">
+<a href="../query/query.html" title="Query">Query</a>
+              <ul class="dropdown-menu">
+                  <li><a href="../query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="../query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
+                  <li><a href="../query/indexing.html" title="Indexing">Indexing</a></li>
+                  <li><a href="../query/lucene.html" title="Lucene Index">Lucene Index</a></li>
+                  <li><a href="../query/property-index.html" title="Property Index">Property Index</a></li>
+                  <li><a href="../query/solr.html" title="Solr Index">Solr Index</a></li>
+              </ul>
+            </li>
+            <li><a href="../security/overview.html" title="Security">Security</a></li>
+            <li><a href="../features/atomic-counter.html" title="Atomic Counter">Atomic Counter</a></li>
+            <li><a href="../features/observation.html" title="Observation">Observation</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Using Oak <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="../use_getting_started.html" title="Getting Started">Getting Started</a></li>
+            <li><a href="../construct.html" title="Repository Construction">Repository Construction</a></li>
+            <li><a href="../osgi_config.html" title="Configuring Oak">Configuring Oak</a></li>
+            <li><a href="../command_line.html" title="Command Line Tools">Command Line Tools</a></li>
+            <li><a href="../migration.html" title="Migration">Migration</a></li>
+            <li><a href="../differences.html" title="Differences to Jackrabbit 2">Differences to Jackrabbit 2</a></li>
+            <li><a href="../known_issues.html" title="Known Issues">Known Issues</a></li>
+            <li><a href="../dos_and_donts.html" title="Dos and Don'ts">Dos and Don'ts</a></li>
+            <li><a href="../coldstandby/coldstandby.html" title="Cold Standby">Cold Standby</a></li>
+            <li><a href="../FAQ.html" title="FAQ">FAQ</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developing Oak <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="../dev_getting_started.html" title="Getting Started">Getting Started</a></li>
+            <li><a href="../participating.html" title="Participating">Participating</a></li>
+            <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
+            <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
+            <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
+            <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Links <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="http://jackrabbit.apache.org/oak" title="Apache Jackrabbit Oak">Apache Jackrabbit Oak</a></li>
+            <li><a href="http://jackrabbit.apache.org/" title="Apache Jackrabbit">Apache Jackrabbit</a></li>
+        </ul>
+      </li>
+              </ul>
+            </div>
+        </div>
+      </div>
+    </div>
+    <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><div id="bannerLeft"><h2>Oak Documentation</h2>
+</div>
+</div>
+        <div class="pull-right"></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+        <li id="publishDate">Last Published: 2017-12-19<span class="divider">|</span>
+</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+        </ul>
+      </div>
+      <div class="row-fluid">
+        <div id="leftColumn" class="span2">
+          <div class="well sidebar-nav">
+<ul class="nav nav-list">
+          <li class="nav-header">Overview</li>
+    <li><a href="../index.html" title="Jackrabbit Oak"><span class="none"></span>Jackrabbit Oak</a>  </li>
+    <li><a href="../license.html" title="License"><span class="none"></span>License</a>  </li>
+    <li><a href="../downloads.html" title="Downloads"><span class="none"></span>Downloads</a>  </li>
+    <li><a href="../articles.html" title="Articles"><span class="none"></span>Articles</a>  </li>
+          <li class="nav-header">Concepts and Architecture</li>
+    <li><a href="../architecture/overview.html" title="Overview"><span class="none"></span>Overview</a>  </li>
+    <li><a href="../architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
+          <li class="nav-header">Main APIs</li>
+    <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
+    <li><a href="../oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
+          <li class="nav-header">Features and Plugins</li>
+    <li><a href="../nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
+      <ul class="nav nav-list">
+    <li><a href="../nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
+      <ul class="nav nav-list">
+    <li><a href="../nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
+    <li><a href="../nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
+    <li><a href="../nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
+    <li><a href="../clustering.html" title="Clustering"><span class="none"></span>Clustering</a>  </li>
+      </ul>
+  </li>
+    <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
+      </ul>
+  </li>
+    <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
+    <li><a href="../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
+      <ul class="nav nav-list">
+    <li><a href="../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="../query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
+    <li><a href="../query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
+    <li><a href="../query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
+    <li><a href="../query/property-index.html" title="Property Index"><span class="none"></span>Property Index</a>  </li>
+    <li><a href="../query/solr.html" title="Solr Index"><span class="none"></span>Solr Index</a>  </li>
+      </ul>
+  </li>
+    <li><a href="../security/overview.html" title="Security"><span class="none"></span>Security</a>  </li>
+    <li><a href="../features/atomic-counter.html" title="Atomic Counter"><span class="none"></span>Atomic Counter</a>  </li>
+    <li><a href="../features/observation.html" title="Observation"><span class="none"></span>Observation</a>  </li>
+          <li class="nav-header">Using Oak</li>
+    <li><a href="../use_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
+    <li><a href="../construct.html" title="Repository Construction"><span class="none"></span>Repository Construction</a>  </li>
+    <li><a href="../osgi_config.html" title="Configuring Oak"><span class="none"></span>Configuring Oak</a>  </li>
+    <li><a href="../command_line.html" title="Command Line Tools"><span class="none"></span>Command Line Tools</a>  </li>
+    <li><a href="../migration.html" title="Migration"><span class="none"></span>Migration</a>  </li>
+    <li><a href="../differences.html" title="Differences to Jackrabbit 2"><span class="none"></span>Differences to Jackrabbit 2</a>  </li>
+    <li><a href="../known_issues.html" title="Known Issues"><span class="none"></span>Known Issues</a>  </li>
+    <li><a href="../dos_and_donts.html" title="Dos and Don'ts"><span class="none"></span>Dos and Don'ts</a>  </li>
+    <li><a href="../coldstandby/coldstandby.html" title="Cold Standby"><span class="none"></span>Cold Standby</a>  </li>
+    <li><a href="../FAQ.html" title="FAQ"><span class="none"></span>FAQ</a>  </li>
+          <li class="nav-header">Developing Oak</li>
+    <li><a href="../dev_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
+    <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
+    <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
+    <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
+    <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
+    <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
+          <li class="nav-header">Links</li>
+    <li><a href="http://jackrabbit.apache.org/oak" class="externalLink" title="Apache Jackrabbit Oak"><span class="none"></span>Apache Jackrabbit Oak</a>  </li>
+    <li><a href="http://jackrabbit.apache.org/" class="externalLink" title="Apache Jackrabbit"><span class="none"></span>Apache Jackrabbit</a>  </li>
+  </ul>
+          <hr />
+          <div id="poweredBy">
+          <script type="text/javascript">asyncJs( 'https://apis.google.com/js/plusone.js' )</script>
+        <div class="g-plusone" data-href="http://jackrabbit.apache.org/oak/docs/" data-size="tall" ></div>
+                  <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="../images/logos/maven-feather.png" /></a>
+              </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<!--
+   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.
+  --><div class="section">
+<h2><a name="Oak_Query_Grammar"></a>Oak Query Grammar</h2>
+<div class="section">
+<h3><a name="XPath"></a>XPath</h3>
+
+<ul>
+  
+<li></li>
+</ul></div>
+<div class="section">
+<h3><a name="SQL-2"></a>SQL-2</h3>
+
+<ul>
+  
+<li><a href="#query">Query</a></li>
+  
+<li><a href="#explain">Explain</a></li>
+  
+<li><a href="#measure">Measure</a></li>
+</ul>
+</div>
+<div class="section" id="query">
+<h3 id="query">Query</h3>
+
+<div class="section">
+<h4><a name="SELECT_____column___...____FROM__selector__join_...____WHERE_constraint___UNION__ALLquery___ORDER_BY__ordering___..._____queryOptions_"></a>
+SELECT { * | { <a href="#column">column</a> [ , ... ] } }
+<br /> FROM { <a href="#selector">selector</a> [ <a href="#join">join</a> ... ] }
+<br /> [ WHERE <a href="#constraint">constraint</a> ]
+<br /> [ UNION [ ALL&#xa0;]&#xa0;<a href="#query">query</a> ]
+<br /> [ ORDER BY { <a href="#ordering">ordering</a> [ , ... ] } ]
+<br /> [ <a href="#options">queryOptions</a> ]
+</h4>
+<p>UNION combines the result of this query with the results of another query, where UNION ALL does not remove duplicate.</p>
+<p>ORDER BY may use an index. If there is no index for the given sort order, then the result is fully read in memory and sorted before returning the first row.</p>
+</div></div>
+<div class="section" id="options">
+<h3 id="options">Options</h3>
+
+<div class="section">
+<h4><a name="OPTION___TRAVERSAL__OK__WARN__FAIL__DEFAULT____INDEX_TAG_tagName_____...__"></a>
+OPTION( { 
+<br />&#160;&#160; TRAVERSAL { OK | WARN | FAIL | DEFAULT } | 
+<br />&#160;&#160; INDEX TAG tagName 
+<br /> } [ , ... ] )
+</h4>
+<p>TRAVERSAL: by default, queries without index will log a warning, except if the configuration option <tt>QueryEngineSettings.failTraversal</tt> is changed The traversal option can be used to change the behavior of the given query: OK to not log a warning, WARN to log a warning, FAIL to fail the query, and DEFAULT to use the default setting.</p>
+<p>INDEX TAG: by default, queries will use the index with the lowest expected cost (as in relational databases). To only consider some of the indexes, add tags (a multi-valued String property) to the index(es) of choice, and specify this tag in the query.</p>
+</div></div>
+<div class="section" id="explain">
+<h3 id="explain">Explain Query</h3>
+
+<div class="section">
+<h4><a name="EXPLAIN_MEASURE__query_"></a>
+EXPLAIN [MEASURE] { <a href="#query">query</a> }
+</h4>
+<p>Does not run the query, but only computes and returns the query plan. With EXPLAIN MEASURE, the expected cost is calculated as well. In both cases, the query result will only have one column called &#x2018;plan&#x2019;, and one row that contains the plan.</p>
+<p>Examples:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">EXPLAIN MEASURE 
+SELECT * FROM [nt:base] WHERE [jcr:uuid] = 1
+</pre></div></div>
+<p>Result:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">plan = [nt:base] as [nt:base] 
+/* property uuid = 1 where [nt:base].[jcr:uuid] = 1 */  
+cost: { &quot;nt:base&quot;: 2.0 } 
+</pre></div></div>
+<p>This means the property index named &#x201c;uuid&#x201d; is used for this query. The expected cost (roughly the number of uncached I/O operations) is 2.</p>
+</div></div>
+<div class="section" id="measure">
+<h3 id="measure">Measure</h3>
+
+<div class="section">
+<h4><a name="MEASURE__query_"></a>
+MEASURE { <a href="#query">query</a> }
+</h4>
+<p>Runs the query, but instead of returning the result, returns the number of rows traversed. The query result has two columns, one called &#x2018;selector&#x2019; and one called &#x2018;scanCount&#x2019;. The result has at least two rows, one that represents the total (selector set to &#x2018;query&#x2019;), and one per selector used in the query. </p>
+<p>Examples:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">MEASURE 
+SELECT * FROM [nt:base] WHERE [jcr:uuid] = 1
+</pre></div></div>
+<p>Result:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">selector = query
+scanCount = 0
+selector = nt:base
+scanCount = 0
+</pre></div></div>
+<p>In this case, the scanCount is zero because the query did not find any nodes.</p></div></div></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+            <p>Copyright &copy;2012&#x2013;2017
+<a href="https://www.apache.org/">The Apache Software Foundation</a>.
+All rights reserved.</p>
+        </div>
+                          <div id="ohloh" class="pull-right">
+      <script type="text/javascript" src="https://www.ohloh.net/p/jackrabbit-oak/widgets/project_thin_badge.js"></script>
+    </div>
+        </div>
+    </footer>
+    </body>
+</html>
\ No newline at end of file

Modified: jackrabbit/site/live/oak/docs/query/index-management.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/index-management.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/query/index-management.html (original)
+++ jackrabbit/site/live/oak/docs/query/index-management.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-11-28 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20171128" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Index Management</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -105,7 +105,6 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +132,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-11-28<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -198,7 +197,6 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -383,7 +381,7 @@ exit
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/query/indexing.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/indexing.html?rev=1821482&r1=1821481&r2=1821482&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/query/indexing.html (original)
+++ jackrabbit/site/live/oak/docs/query/indexing.html Thu Jan 18 11:08:07 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-10 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-11-28 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180110" />
+    <meta name="Date-Revision-yyyymmdd" content="20171128" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Indexing</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -105,7 +105,6 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
-            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -133,9 +132,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-10<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-11-28<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -199,7 +198,6 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
-    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -672,7 +670,7 @@ Removing corrupt flag from index [/oak:i
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
+            <p>Copyright &copy;2012&#x2013;2017
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>