date:20181010

svn commit: r1843531 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/pom.xml

2018-10-10 Thread reschke

Author: reschke
Date: Thu Oct 11 04:28:21 2018
New Revision: 1843531

URL: http://svn.apache.org/viewvc?rev=1843531=rev
Log:
OAK-7814: Update tika dependency to 1.19.1 (ported to 1.8)

Modified:
jackrabbit/oak/branches/1.8/   (props changed)
jackrabbit/oak/branches/1.8/oak-parent/pom.xml

Propchange: jackrabbit/oak/branches/1.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 11 04:28:21 2018
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158
 
,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024,1840455,1840574,1841314,1841352
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158
 
,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024,1840455,1840574,1841314,1841352,1843398
 /jackrabbit/trunk:1345480

Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1843531=1843530=1843531=diff
==
--- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Thu Oct 11 04:28:21 2018
@@ -62,7 +62,7 @@
 1.7.6 
 1.1.0
 1.4.194
-1.19
+1.19.1
 10.14.2.0
 2.9.6
 1.8

svn commit: r1843523 - /jackrabbit/oak/trunk/oak-doc/README.md

2018-10-10 Thread catholicon

Author: catholicon
Date: Wed Oct 10 23:00:35 2018
New Revision: 1843523

URL: http://svn.apache.org/viewvc?rev=1843523=rev
Log:
OAK-7817: oak-doc-railroad-macro should be built in default reactor built

Document to build oak-doc-railroad-macro before preparing site

Modified:
jackrabbit/oak/trunk/oak-doc/README.md

Modified: jackrabbit/oak/trunk/oak-doc/README.md
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/README.md?rev=1843523=1843522=1843523=diff
==
--- jackrabbit/oak/trunk/oak-doc/README.md (original)
+++ jackrabbit/oak/trunk/oak-doc/README.md Wed Oct 10 23:00:35 2018
@@ -23,7 +23,7 @@ that it easy to view e.g. from GitHub. A
 can be used to build and deploy a web site as follows:
 
 From the reactor do
-
+mvn clean install -Pdoc -pl :oak-doc-railroad-macro # oak-doc requires to 
be installed locally as this module isn't released
 mvn clean -Pdoc
 
 to clean any existing site,

svn commit: r1843522 - /jackrabbit/oak/trunk/pom.xml

2018-10-10 Thread catholicon

Author: catholicon
Date: Wed Oct 10 23:00:25 2018
New Revision: 1843522

URL: http://svn.apache.org/viewvc?rev=1843522=rev
Log:
OAK-7817: oak-doc-railroad-macro should be built in default reactor built

Revert r1843453 as it seems it's hard to avoid releasing
oak-doc-railroad-macro while keeping it in reactor. We shall update
oak-doc/README instead

Modified:
jackrabbit/oak/trunk/pom.xml

Modified: jackrabbit/oak/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1843522=1843521=1843522=diff
==
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Wed Oct 10 23:00:25 2018
@@ -73,8 +73,6 @@
 oak-segment-tar
 oak-segment-azure
 oak-benchmarks
-
-oak-doc-railroad-macro
   
 
   
@@ -111,6 +109,7 @@
   doc
   
 oak-doc
+oak-doc-railroad-macro

svn commit: r1843458 - in /jackrabbit/oak/branches/1.8: ./ oak-examples/standalone/pom.xml oak-examples/webapp/ oak-examples/webapp/pom.xml oak-lucene/pom.xml oak-parent/pom.xml oak-pojosr/pom.xml oak

2018-10-10 Thread reschke

Author: reschke
Date: Wed Oct 10 14:47:34 2018
New Revision: 1843458

URL: http://svn.apache.org/viewvc?rev=1843458=rev
Log:
OAK-7767: Update tika dependency to 1.19 (ported to 1.8)

Modified:
jackrabbit/oak/branches/1.8/   (props changed)
jackrabbit/oak/branches/1.8/oak-examples/standalone/pom.xml
jackrabbit/oak/branches/1.8/oak-examples/webapp/   (props changed)
jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml
jackrabbit/oak/branches/1.8/oak-lucene/pom.xml
jackrabbit/oak/branches/1.8/oak-parent/pom.xml
jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml
jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml

Propchange: jackrabbit/oak/branches/1.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 10 14:47:34 2018
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158
 
,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024,1840455,1840574
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158
 
,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024,1840455,1840574,1841314,1841352
 /jackrabbit/trunk:1345480

Modified: jackrabbit/oak/branches/1.8/oak-examples/standalone/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-examples/standalone/pom.xml?rev=1843458=1843457=1843458=diff
==
--- jackrabbit/oak/branches/1.8/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-examples/standalone/pom.xml Wed Oct 10 
14:47:34 2018
@@ -133,6 +133,10 @@
   commons-logging
 
 
+  org.slf4j
+  slf4j-log4j12
+
+
   org.apache.httpcomponents
   httpcore
 

Propchange: jackrabbit/oak/branches/1.8/oak-examples/webapp/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 10 14:47:34 2018
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272/jackrabbit-webapp:1173165-1176545
-/jackrabbit/oak/trunk/oak-examples/webapp:1823669,1825561,1834291,1835521,1837657

svn commit: r1843453 - /jackrabbit/oak/trunk/pom.xml

2018-10-10 Thread catholicon

Author: catholicon
Date: Wed Oct 10 13:57:14 2018
New Revision: 1843453

URL: http://svn.apache.org/viewvc?rev=1843453=rev
Log:
OAK-7817: oak-doc-railroad-macro should be built in default reactor built

Modified:
jackrabbit/oak/trunk/pom.xml

Modified: jackrabbit/oak/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1843453=1843452=1843453=diff
==
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Wed Oct 10 13:57:14 2018
@@ -73,6 +73,8 @@
 oak-segment-tar
 oak-segment-azure
 oak-benchmarks
+
+oak-doc-railroad-macro
   
 
   
@@ -109,7 +111,6 @@
   doc
   
 oak-doc
-oak-doc-railroad-macro

svn commit: r1843449 - /jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java

2018-10-10 Thread adulceanu

Author: adulceanu
Date: Wed Oct 10 13:28:36 2018
New Revision: 1843449

URL: http://svn.apache.org/viewvc?rev=1843449=rev
Log:
OAK-7815 - Obscure error message if AZURE_SECRET_KEY env variable is not set 
for Azure persistence

Modified:

jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java

Modified: 
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java?rev=1843449=1843448=1843449=diff
==
--- 
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java
 Wed Oct 10 13:28:36 2018
@@ -123,7 +123,15 @@ public class ToolUtils {
 
 String accountName = config.get(KEY_ACCOUNT_NAME);
 String key = System.getenv("AZURE_SECRET_KEY");
-StorageCredentials credentials = new 
StorageCredentialsAccountAndKey(accountName, key);
+
+StorageCredentials credentials = null;
+try {
+credentials = new StorageCredentialsAccountAndKey(accountName, 
key);
+} catch (IllegalArgumentException e) {
+throw new IllegalArgumentException(
+"Could not connect to the Azure Storage. Please verify if 
AZURE_SECRET_KEY environment variable "
++ "is correctly set!");
+}
 
 String uri = config.get(KEY_STORAGE_URI);
 String dir = config.get(KEY_DIR);

svn commit: r1843418 - /jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java

2018-10-10 Thread stillalex

Author: stillalex
Date: Wed Oct 10 09:56:33 2018
New Revision: 1843418

URL: http://svn.apache.org/viewvc?rev=1843418=rev
Log:
OAK-7813 PrivilegeBits should also cache default privilege as long values


Modified:

jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java

Modified: 
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java?rev=1843418=1843417=1843418=diff
==
--- 
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
 Wed Oct 10 09:56:33 2018
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.oak.spi.security.privilege;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import com.google.common.primitives.Longs;
@@ -65,34 +66,69 @@ public final class PrivilegeBits impleme
 
 public static final PrivilegeBits EMPTY = new 
PrivilegeBits(UnmodifiableData.EMPTY);
 
-public static final Map BUILT_IN = new 
HashMap();
+public static final Map BUILT_IN;
+private static final Map BUILT_IN_BITS;
+
 static {
-BUILT_IN.put(REP_READ_NODES, getInstance(READ_NODES));
-BUILT_IN.put(REP_READ_PROPERTIES, getInstance(READ_PROPERTIES));
-BUILT_IN.put(REP_ADD_PROPERTIES, getInstance(ADD_PROPERTIES));
-BUILT_IN.put(REP_ALTER_PROPERTIES, getInstance(ALTER_PROPERTIES));
-BUILT_IN.put(REP_REMOVE_PROPERTIES, getInstance(REMOVE_PROPERTIES));
-BUILT_IN.put(JCR_ADD_CHILD_NODES, getInstance(ADD_CHILD_NODES));
-BUILT_IN.put(JCR_REMOVE_CHILD_NODES, getInstance(REMOVE_CHILD_NODES));
-BUILT_IN.put(JCR_REMOVE_NODE, getInstance(REMOVE_NODE));
-BUILT_IN.put(JCR_READ_ACCESS_CONTROL, getInstance(READ_AC));
-BUILT_IN.put(JCR_MODIFY_ACCESS_CONTROL, getInstance(MODIFY_AC));
-BUILT_IN.put(JCR_NODE_TYPE_MANAGEMENT, getInstance(NODE_TYPE_MNGMT));
-BUILT_IN.put(JCR_VERSION_MANAGEMENT, getInstance(VERSION_MNGMT));
-BUILT_IN.put(JCR_LOCK_MANAGEMENT, getInstance(LOCK_MNGMT));
-BUILT_IN.put(JCR_LIFECYCLE_MANAGEMENT, getInstance(LIFECYCLE_MNGMT));
-BUILT_IN.put(JCR_RETENTION_MANAGEMENT, getInstance(RETENTION_MNGMT));
-BUILT_IN.put(JCR_WORKSPACE_MANAGEMENT, getInstance(WORKSPACE_MNGMT));
-BUILT_IN.put(JCR_NODE_TYPE_DEFINITION_MANAGEMENT, 
getInstance(NODE_TYPE_DEF_MNGMT));
-BUILT_IN.put(JCR_NAMESPACE_MANAGEMENT, getInstance(NAMESPACE_MNGMT));
-BUILT_IN.put(REP_PRIVILEGE_MANAGEMENT, getInstance(PRIVILEGE_MNGMT));
-BUILT_IN.put(REP_USER_MANAGEMENT, getInstance(USER_MNGMT));
-BUILT_IN.put(REP_INDEX_DEFINITION_MANAGEMENT, 
getInstance(INDEX_DEFINITION_MNGMT));
-
-BUILT_IN.put(JCR_READ, PrivilegeBits.getInstance(READ));
-BUILT_IN.put(JCR_MODIFY_PROPERTIES, 
PrivilegeBits.getInstance(MODIFY_PROPERTIES));
-BUILT_IN.put(JCR_WRITE, PrivilegeBits.getInstance(WRITE));
-BUILT_IN.put(REP_WRITE, PrivilegeBits.getInstance(WRITE2));
+Map privs = new HashMap();
+privs.put(REP_READ_NODES, getInstance(READ_NODES));
+privs.put(REP_READ_PROPERTIES, getInstance(READ_PROPERTIES));
+privs.put(REP_ADD_PROPERTIES, getInstance(ADD_PROPERTIES));
+privs.put(REP_ALTER_PROPERTIES, getInstance(ALTER_PROPERTIES));
+privs.put(REP_REMOVE_PROPERTIES, getInstance(REMOVE_PROPERTIES));
+privs.put(JCR_ADD_CHILD_NODES, getInstance(ADD_CHILD_NODES));
+privs.put(JCR_REMOVE_CHILD_NODES, getInstance(REMOVE_CHILD_NODES));
+privs.put(JCR_REMOVE_NODE, getInstance(REMOVE_NODE));
+privs.put(JCR_READ_ACCESS_CONTROL, getInstance(READ_AC));
+privs.put(JCR_MODIFY_ACCESS_CONTROL, getInstance(MODIFY_AC));
+privs.put(JCR_NODE_TYPE_MANAGEMENT, getInstance(NODE_TYPE_MNGMT));
+privs.put(JCR_VERSION_MANAGEMENT, getInstance(VERSION_MNGMT));
+privs.put(JCR_LOCK_MANAGEMENT, getInstance(LOCK_MNGMT));
+privs.put(JCR_LIFECYCLE_MANAGEMENT, getInstance(LIFECYCLE_MNGMT));
+privs.put(JCR_RETENTION_MANAGEMENT, getInstance(RETENTION_MNGMT));
+privs.put(JCR_WORKSPACE_MANAGEMENT, getInstance(WORKSPACE_MNGMT));
+privs.put(JCR_NODE_TYPE_DEFINITION_MANAGEMENT, 
getInstance(NODE_TYPE_DEF_MNGMT));
+privs.put(JCR_NAMESPACE_MANAGEMENT, getInstance(NAMESPACE_MNGMT));
+privs.put(REP_PRIVILEGE_MANAGEMENT, getInstance(PRIVILEGE_MNGMT));
+privs.put(REP_USER_MANAGEMENT, getInstance(USER_MNGMT));
+

svn commit: r1843416 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

2018-10-10 Thread tommaso

Author: tommaso
Date: Wed Oct 10 09:34:48 2018
New Revision: 1843416

URL: http://svn.apache.org/viewvc?rev=1843416=rev
Log:
OAK-7795 - Log a debug message when two or more indices have same or very close 
cost amounts

Modified:

jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1843416=1843415=1843416=diff
==
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
 Wed Oct 10 09:34:48 2018
@@ -974,6 +974,10 @@ public class QueryImpl implements Query
 double bestCost = Double.POSITIVE_INFINITY;
 IndexPlan bestPlan = null;
 
+// track similar costs
+QueryIndex almostBestIndex = null;
+double almostBestCost = Double.POSITIVE_INFINITY;
+
 // Sort the indexes according to their minimum cost to be able to skip 
the remaining indexes if the cost of the
 // current index is below the minimum cost of the next index.
 List queryIndexes = MINIMAL_COST_ORDERING
@@ -1042,12 +1046,25 @@ public class QueryImpl implements Query
 if (cost < 0) {
 LOG.error("cost below 0 for " + indexName + " is " + cost);
 }
+
 if (cost < bestCost) {
+almostBestCost = bestCost;
+almostBestIndex = bestIndex;
+
 bestCost = cost;
 bestIndex = index;
 bestPlan = indexPlan;
+} else if (cost - bestCost <= 0.1) {
+almostBestCost = cost;
+almostBestIndex = index;
 }
 }
+
+if (LOG.isDebugEnabled() && Math.abs(bestCost - almostBestCost) <= 
0.1) {
+LOG.debug("selected index {} and {} have similar costs {} and {} 
for query {} - check query explanation / index definitions",
+bestIndex, almostBestIndex, bestCost, almostBestCost, 
filter.toString());
+}
+
 potentiallySlowTraversalQuery = bestIndex == null;
 if (traversalEnabled) {
 TraversingIndex traversal = new TraversingIndex();

svn commit: r1843401 - in /jackrabbit/oak/trunk: oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ oak-auth-external/src/test/java/org/apache/jackrab

2018-10-10 Thread stillalex

Author: stillalex
Date: Wed Oct 10 07:38:01 2018
New Revision: 1843401

URL: http://svn.apache.org/viewvc?rev=1843401=rev
Log:
OAK-7288 Change default JAAS ranking of ExternalLoginModuleFactory
 - based on a patch provided by Lars Krapf


Modified:

jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java

jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java

jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java

jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/externalloginmodule.md

Modified: 
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java?rev=1843401=1843400=1843401=diff
==
--- 
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
 Wed Oct 10 07:38:01 2018
@@ -64,7 +64,7 @@ public class ExternalLoginModuleFactory
 
 @SuppressWarnings("UnusedDeclaration")
 @Property(
-intValue = 50,
+intValue = 150,
 label = "JAAS Ranking",
 description = "Specifying the ranking (i.e. sort order) of this 
login module entry. The entries are sorted " +
 "in a descending order (i.e. higher value ranked 
configurations come first)."

Modified: 
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java?rev=1843401=1843400=1843401=diff
==
--- 
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java
 Wed Oct 10 07:38:01 2018
@@ -79,14 +79,15 @@ public class PreAuthDefaultExternalLogin
 preAuthOptions);
 
 AppConfigurationEntry entry2 = new AppConfigurationEntry(
-LoginModuleImpl.class.getName(),
-AppConfigurationEntry.LoginModuleControlFlag.OPTIONAL,
-new HashMap());
-
-AppConfigurationEntry entry3 = new AppConfigurationEntry(
 ExternalLoginModule.class.getName(),
 
AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
 options);
+
+AppConfigurationEntry entry3 = new AppConfigurationEntry(
+LoginModuleImpl.class.getName(),
+
AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
+new HashMap());
+
 return new AppConfigurationEntry[]{entry1, entry2, entry3};
 }
 };

Modified: 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java?rev=1843401=1843400=1843401=diff
==
--- 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
 Wed Oct 10 07:38:01 2018
@@ -22,10 +22,17 @@ import javax.security.auth.login.AppConf
 import javax.security.auth.login.Configuration;
 
 import com.google.common.collect.ImmutableMap;
+
+import 
org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule;
 import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl;
+import

svn commit: r1843398 - /jackrabbit/oak/trunk/oak-parent/pom.xml

2018-10-10 Thread reschke

Author: reschke
Date: Wed Oct 10 07:18:07 2018
New Revision: 1843398

URL: http://svn.apache.org/viewvc?rev=1843398=rev
Log:
OAK-7814: Update tika dependency to 1.19.1

Modified:
jackrabbit/oak/trunk/oak-parent/pom.xml

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1843398=1843397=1843398=diff
==
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Oct 10 07:18:07 2018
@@ -58,7 +58,7 @@
 1.7.25 
 1.2.3
 1.4.194
-1.19
+1.19.1
 15.0
 
com.google.common.*;version="[15.0,21)"
 10.14.2.0

svn commit: r1843531 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/pom.xml

svn commit: r1843523 - /jackrabbit/oak/trunk/oak-doc/README.md

svn commit: r1843522 - /jackrabbit/oak/trunk/pom.xml

svn commit: r1843458 - in /jackrabbit/oak/branches/1.8: ./ oak-examples/standalone/pom.xml oak-examples/webapp/ oak-examples/webapp/pom.xml oak-lucene/pom.xml oak-parent/pom.xml oak-pojosr/pom.xml oak

svn commit: r1843453 - /jackrabbit/oak/trunk/pom.xml

svn commit: r1843449 - /jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java

svn commit: r1843418 - /jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java

svn commit: r1843416 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

svn commit: r1843401 - in /jackrabbit/oak/trunk: oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ oak-auth-external/src/test/java/org/apache/jackrab

svn commit: r1843398 - /jackrabbit/oak/trunk/oak-parent/pom.xml

10 matches

Site Navigation

Mail list logo

Footer information