You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/01/26 10:59:54 UTC

svn commit: r1822271 [11/16] - in /jackrabbit/site/live/oak/docs: ./ architecture/ coldstandby/ features/ nodestore/ nodestore/document/ nodestore/segment/ oak-mongo-js/ oak-mongo-js/fonts/ oak-mongo-js/scripts/ oak-mongo-js/styles/ oak_api/ plugins/ q...

Modified: jackrabbit/site/live/oak/docs/query/search-mt.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/search-mt.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/query/search-mt.html (original)
+++ jackrabbit/site/live/oak/docs/query/search-mt.html Fri Jan 26 10:59:53 2018
@@ -1,296 +1,304 @@
-<!DOCTYPE html>
-<!--
- | 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="20171128" />
-    <meta http-equiv="Content-Language" content="en" />
-    <title>Jackrabbit Oak &#x2013; Machine Translation for Search</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-11-28<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="Machine_Translation_for_Search"></a>Machine Translation for Search</h2>
-
-<ul>
-  
-<li><a href="#qtmtl">Query time MT for Lucene indexes</a>
-  
-<ul>
-    
-<li><a href="#joshua">Apache Joshua</a>
-    
-<ul>
-      
-<li><a href="#languagepacks">Language Packs</a></li>
-    </ul></li>
-    
-<li><a href="#setup">Setup</a></li>
-  </ul></li>
-</ul>
-<p>Oak supports CLIR (Cross Language Information Retrieval) by using <i>Machine Translation</i> to decorate search queries. Such an extension is provided within the <i>oak-search-mt</i> bundle.</p>
-<div class="section">
-<h3><a name="Query_time_MT_for_Lucene_indexes"></a><a name="qtmtl"></a> Query time MT for Lucene indexes</h3>
-<p>Machine translation at query time is supported for Oak Lucene indexes by an extension of Oak Lucene&#x2019;s <i>FulltextQueryTermsProvider</i> API called <i>MTFulltextQueryTermsProvider</i>. The initial implementation details can be found in <a class="externalLink" href="https://issues.apache.org/jira/browse/OAK-4348">OAK-4348</a>.</p>
-<p>The <i>MTFulltextQueryTermsProvider</i> will take the text of a given query and eventually translate it and provide a new Lucene query (to be added to the original one). Query time machine translation will be performed in the <i>MTFulltextQueryTermsProvider</i> only if the index definition of the selected index matches the node types defined in the <i>MTFulltextQueryTermsProvider</i> configuration (e.g. Oak:Unstructured).</p>
-<p>The <i>MTFulltextQueryTermsProvider</i> will try to perform the translation of the whole text first and, secondly, of the single tokens as they are created by the Lucene <i>Analyzer</i> passed in the <i>#getQueryTerm(String text, Analyzer analyzer, NodeState indexDefinition)</i> API call.</p>
-<p>Machine Translation is currently implemented by means of Apache Joshua, a statistical machine translation toolkit. <i>MTFulltextQueryTermsProvider</i> will require a <i>language pack</i> (a SMT model) in order to perform translation of search queries.</p>
-<div class="section">
-<h4><a name="Apache_Joshua"></a><a name="joshua"></a> Apache Joshua</h4>
-<p>Apache Joshua is a statistical machine translation toolkit originally developed at Johns Hopkins University University of Pennsylvania, donated in 2015 to the Apache Software Foundation. For more information on the usage of Apache Joshua for multi language search see the slides/video from the Berlin Buzzwords 2017 presentation <a class="externalLink" href="https://berlinbuzzwords.de/17/session/embracing-diversity-searching-over-multiple-languages">Embracing diversity: searching over multiple languages</a>.</p>
-<div class="section">
-<h5><a name="Language_Packs"></a><a name="languagepacks"></a> Language Packs</h5>
-<p>Apache Joshua can be used to train machine translation models called <i>language packs</i>, however it provides a set of ready to use (Apache licensed) language packs for many language pairs at:</p>
-<p><a class="externalLink" href="https://cwiki.apache.org/confluence/display/JOSHUA/Language+Packs">https://cwiki.apache.org/confluence/display/JOSHUA/Language+Packs</a></p></div></div>
-<div class="section">
-<h4><a name="Setup"></a><a name="setup"></a> Setup</h4>
-<p>Multiple <i>MTFulltextQueryTermsProvider</i> can be configured (for different language pairs) by using <i>MTFulltextQueryTermsProviderFactory</i> OSGi configuration factory. In order to instantiate a <i>MTFulltextQueryTermsProviderFactory</i> the following properties need to be configured:</p>
-
-<ul>
-  
-<li><i>path.to.config</i> -&gt; the path to the <i>joshua.config</i> configuration file (e.g. of a downloaded language pack)</li>
-  
-<li><i>node.types</i> -&gt; the list of node types for which query time MT expansion should be done</li>
-  
-<li><i>min.score</i> -&gt; the minimum score (between 0 and 1) for a translated sentence / token to be used while expanding the query (this is used to filter out low quality translations)</li>
-</ul></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>
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
+ | 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="20180125" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Jackrabbit Oak &#x2013; Machine Translation for Search</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/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>
+                  <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="../constraints.html" title="Constraints">Constraints</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="../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>
+      </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: 2018-01-25<span class="divider">|</span>
+</li>
+          <li id="projectVersion">Version: 1.10-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/grammar-xpath.html" title="XPath Grammar"><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>
+    <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="../constraints.html" title="Constraints"><span class="none"></span>Constraints</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="../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>
+    <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="Machine_Translation_for_Search"></a>Machine Translation for Search</h2>
+
+<ul>
+  
+<li><a href="#qtmtl">Query time MT for Lucene indexes</a>
+  
+<ul>
+    
+<li><a href="#joshua">Apache Joshua</a>
+    
+<ul>
+      
+<li><a href="#languagepacks">Language Packs</a></li>
+    </ul></li>
+    
+<li><a href="#setup">Setup</a></li>
+  </ul></li>
+</ul>
+<p>Oak supports CLIR (Cross Language Information Retrieval) by using <i>Machine Translation</i> to decorate search queries. Such an extension is provided within the <i>oak-search-mt</i> bundle.</p>
+<div class="section">
+<h3><a name="Query_time_MT_for_Lucene_indexes"></a><a name="qtmtl"></a> Query time MT for Lucene indexes</h3>
+<p>Machine translation at query time is supported for Oak Lucene indexes by an extension of Oak Lucene&#x2019;s <i>FulltextQueryTermsProvider</i> API called <i>MTFulltextQueryTermsProvider</i>. The initial implementation details can be found in <a class="externalLink" href="https://issues.apache.org/jira/browse/OAK-4348">OAK-4348</a>.</p>
+<p>The <i>MTFulltextQueryTermsProvider</i> will take the text of a given query and eventually translate it and provide a new Lucene query (to be added to the original one). Query time machine translation will be performed in the <i>MTFulltextQueryTermsProvider</i> only if the index definition of the selected index matches the node types defined in the <i>MTFulltextQueryTermsProvider</i> configuration (e.g. Oak:Unstructured).</p>
+<p>The <i>MTFulltextQueryTermsProvider</i> will try to perform the translation of the whole text first and, secondly, of the single tokens as they are created by the Lucene <i>Analyzer</i> passed in the <i>#getQueryTerm(String text, Analyzer analyzer, NodeState indexDefinition)</i> API call.</p>
+<p>Machine Translation is currently implemented by means of Apache Joshua, a statistical machine translation toolkit. <i>MTFulltextQueryTermsProvider</i> will require a <i>language pack</i> (a SMT model) in order to perform translation of search queries.</p>
+<div class="section">
+<h4><a name="Apache_Joshua"></a><a name="joshua"></a> Apache Joshua</h4>
+<p>Apache Joshua is a statistical machine translation toolkit originally developed at Johns Hopkins University University of Pennsylvania, donated in 2015 to the Apache Software Foundation. For more information on the usage of Apache Joshua for multi language search see the slides/video from the Berlin Buzzwords 2017 presentation <a class="externalLink" href="https://berlinbuzzwords.de/17/session/embracing-diversity-searching-over-multiple-languages">Embracing diversity: searching over multiple languages</a>.</p>
+<div class="section">
+<h5><a name="Language_Packs"></a><a name="languagepacks"></a> Language Packs</h5>
+<p>Apache Joshua can be used to train machine translation models called <i>language packs</i>, however it provides a set of ready to use (Apache licensed) language packs for many language pairs at:</p>
+<p><a class="externalLink" href="https://cwiki.apache.org/confluence/display/JOSHUA/Language+Packs">https://cwiki.apache.org/confluence/display/JOSHUA/Language+Packs</a></p></div></div>
+<div class="section">
+<h4><a name="Setup"></a><a name="setup"></a> Setup</h4>
+<p>Multiple <i>MTFulltextQueryTermsProvider</i> can be configured (for different language pairs) by using <i>MTFulltextQueryTermsProviderFactory</i> OSGi configuration factory. In order to instantiate a <i>MTFulltextQueryTermsProviderFactory</i> the following properties need to be configured:</p>
+
+<ul>
+  
+<li><i>path.to.config</i> -&gt; the path to the <i>joshua.config</i> configuration file (e.g. of a downloaded language pack)</li>
+  
+<li><i>node.types</i> -&gt; the list of node types for which query time MT expansion should be done</li>
+  
+<li><i>min.score</i> -&gt; the minimum score (between 0 and 1) for a translated sentence / token to be used while expanding the query (this is used to filter out low quality translations)</li>
+</ul></div></div></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+            <p>Copyright &copy;2012&#x2013;2018
+<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/solr.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/query/solr.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/query/solr.html (original)
+++ jackrabbit/site/live/oak/docs/query/solr.html Fri Jan 26 10:59:53 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
  | 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="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180125" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Solr Index</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <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>
@@ -70,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>
@@ -92,6 +95,7 @@
             <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="../constraints.html" title="Constraints">Constraints</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>
@@ -104,6 +108,7 @@
             <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>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-25<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </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/grammar-xpath.html" title="XPath Grammar"><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>
@@ -188,6 +196,7 @@
     <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="../constraints.html" title="Constraints"><span class="none"></span>Constraints</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>
@@ -196,6 +205,7 @@
     <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>
@@ -463,7 +473,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/release-schedule.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/release-schedule.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/release-schedule.html (original)
+++ jackrabbit/site/live/oak/docs/release-schedule.html Fri Jan 26 10:59:53 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-06-19 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
  | 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="20170619" />
+    <meta name="Date-Revision-yyyymmdd" content="20180125" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Release Schedule</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <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>
@@ -70,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>
@@ -92,6 +95,7 @@
             <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="constraints.html" title="Constraints">Constraints</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>
@@ -104,6 +108,7 @@
             <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>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-06-19<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-25<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </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/grammar-xpath.html" title="XPath Grammar"><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>
@@ -187,6 +195,7 @@
     <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="constraints.html" title="Constraints"><span class="none"></span>Constraints</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>
@@ -195,6 +204,7 @@
     <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 class="active"><a href="#"><span class="none"></span>Release Schedule</a>
   </li>
@@ -252,7 +262,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/security/accesscontrol.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/accesscontrol.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/accesscontrol.html (original)
+++ jackrabbit/site/live/oak/docs/security/accesscontrol.html Fri Jan 26 10:59:53 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
  | 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="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180125" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Access Control Management</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <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>
@@ -70,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>
@@ -92,6 +95,7 @@
             <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="../constraints.html" title="Constraints">Constraints</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>
@@ -104,6 +108,7 @@
             <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>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-25<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </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/grammar-xpath.html" title="XPath Grammar"><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>
@@ -187,6 +195,7 @@
     <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="../constraints.html" title="Constraints"><span class="none"></span>Constraints</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>
@@ -195,6 +204,7 @@
     <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>
@@ -409,7 +419,7 @@ session.save();
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/security/accesscontrol/default.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/accesscontrol/default.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/accesscontrol/default.html (original)
+++ jackrabbit/site/live/oak/docs/security/accesscontrol/default.html Fri Jan 26 10:59:53 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
  | 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="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180125" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Access Control Management : The Default Implementation</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <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>
@@ -70,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>
@@ -92,6 +95,7 @@
             <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="../../constraints.html" title="Constraints">Constraints</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>
@@ -104,6 +108,7 @@
             <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>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-25<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </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/grammar-xpath.html" title="XPath Grammar"><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>
@@ -187,6 +195,7 @@
     <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="../../constraints.html" title="Constraints"><span class="none"></span>Constraints</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>
@@ -195,6 +204,7 @@
     <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>
@@ -620,7 +630,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/security/accesscontrol/differences.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/accesscontrol/differences.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/accesscontrol/differences.html (original)
+++ jackrabbit/site/live/oak/docs/security/accesscontrol/differences.html Fri Jan 26 10:59:53 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
  | 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="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180125" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Access Control Management : Differences wrt Jackrabbit 2.x</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <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>
@@ -70,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>
@@ -92,6 +95,7 @@
             <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="../../constraints.html" title="Constraints">Constraints</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>
@@ -104,6 +108,7 @@
             <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>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-25<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </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/grammar-xpath.html" title="XPath Grammar"><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>
@@ -187,6 +195,7 @@
     <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="../../constraints.html" title="Constraints"><span class="none"></span>Constraints</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>
@@ -195,6 +204,7 @@
     <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>
@@ -294,7 +304,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/security/accesscontrol/editing.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/security/accesscontrol/editing.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/security/accesscontrol/editing.html (original)
+++ jackrabbit/site/live/oak/docs/security/accesscontrol/editing.html Fri Jan 26 10:59:53 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
  | 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="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180125" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Using the Access Control Management API</title>
     <link rel="stylesheet" href="../../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <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>
@@ -70,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>
@@ -92,6 +95,7 @@
             <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="../../constraints.html" title="Constraints">Constraints</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>
@@ -104,6 +108,7 @@
             <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>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-01-25<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </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/grammar-xpath.html" title="XPath Grammar"><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>
@@ -187,6 +195,7 @@
     <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="../../constraints.html" title="Constraints"><span class="none"></span>Constraints</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>
@@ -195,6 +204,7 @@
     <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>
@@ -639,7 +649,7 @@ if (acl != null) {
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>