svn commit: r1828765 - /jackrabbit/oak/trunk/oak-benchmarks/README.md

2018-04-09 Thread stillalex 
Author: stillalex
Date: Mon Apr  9 19:03:12 2018
New Revision: 1828765

URL: http://svn.apache.org/viewvc?rev=1828765=rev
Log:
@trivial updated readme on how to run benchmarks


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

Modified: jackrabbit/oak/trunk/oak-benchmarks/README.md
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/README.md?rev=1828765=1828764=1828765=diff
==
--- jackrabbit/oak/trunk/oak-benchmarks/README.md (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/README.md Mon Apr  9 19:03:12 2018
@@ -16,7 +16,7 @@ Benchmark mode
 The benchmark mode is used for executing various micro-benchmarks. It can
 be invoked like this:
 
-$ java -jar oak-run-*.jar benchmark [options] [testcases] [fixtures]
+$ java -jar oak-benchmarks-*.jar benchmark [options] [testcases] [fixtures]
 
 The following benchmark options (with default values) are currently supported:
 
@@ -216,7 +216,7 @@ Scalability mode
 The scalability mode is used for executing various scalability suites to test 
the 
 performance of various associated tests. It can be invoked like this:
 
-$ java -jar oak-run-*.jar scalability [options] [suites] [fixtures]
+$ java -jar oak-benchmarks-*.jar scalability [options] [suites] [fixtures]
 
 The following scalability options (with default values) are currently 
supported:

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

2018-04-09 Thread reschke 
Author: reschke
Date: Mon Apr  9 16:24:03 2018
New Revision: 1828750

URL: http://svn.apache.org/viewvc?rev=1828750=rev
Log:
OAK-7387: Update Oak trunk to Jackrabbit 2.17.2

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=1828750=1828749=1828750=diff
==
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Apr  9 16:24:03 2018
@@ -43,7 +43,7 @@
 
   ${project.build.sourceEncoding}
 
-2.17.1
+2.17.2
 127.0.0.1
 27017
 MongoMKDB

svn commit: r1828740 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java

2018-04-09 Thread mduerig 
Author: mduerig
Date: Mon Apr  9 15:39:09 2018
New Revision: 1828740

URL: http://svn.apache.org/viewvc?rev=1828740=rev
Log:
OAK-7396: ReadOnlyFileStore.readSegment does not correctly throw 
SegmentNotFoundException
Catch UncheckedExecutionException along with ExecutionException

Modified:

jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java?rev=1828740=1828739=1828740=diff
==
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
 Mon Apr  9 15:39:09 2018
@@ -32,6 +32,7 @@ import java.util.concurrent.ExecutionExc
 import javax.annotation.Nonnull;
 
 import com.google.common.io.Closer;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import org.apache.jackrabbit.oak.segment.RecordId;
 import org.apache.jackrabbit.oak.segment.Segment;
 import org.apache.jackrabbit.oak.segment.SegmentId;
@@ -117,7 +118,7 @@ public class ReadOnlyFileStore extends A
 return readSegmentUncached(tarFiles, id);
 }
 });
-} catch (ExecutionException e) {
+} catch (ExecutionException | UncheckedExecutionException e) {
 throw asSegmentNotFoundException(e, id);
 }
 }

svn commit: r1828706 - in /jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization: IntroductionTest.java advanced/L2_SetupAggregationTest.java

2018-04-09 Thread angela 
Author: angela
Date: Mon Apr  9 12:05:57 2018
New Revision: 1828706

URL: http://svn.apache.org/viewvc?rev=1828706=rev
Log:
OAK-5122 : Exercise for Custom Authorization Models (wip)

Modified:

jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/IntroductionTest.java

jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L2_SetupAggregationTest.java

Modified: 
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/IntroductionTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/IntroductionTest.java?rev=1828706=1828705=1828706=diff
==
--- 
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/IntroductionTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/IntroductionTest.java
 Mon Apr  9 12:05:57 2018
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.spi.sec
  *
  * Goal:
  * Get a basic understanding how authorization is organized in Oak and become
- * familiar with distiction between access control management and permission
+ * familiar with distinction between access control management and permission
  * evaluation.
  *
  * Exercises:

Modified: 
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L2_SetupAggregationTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L2_SetupAggregationTest.java?rev=1828706=1828705=1828706=diff
==
--- 
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L2_SetupAggregationTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L2_SetupAggregationTest.java
 Mon Apr  9 12:05:57 2018
@@ -31,7 +31,44 @@ package org.apache.jackrabbit.oak.exerci
  * Note, that this section only focuses on OSGi-based Oak setup scenarios.
  *
  * Exercises:
- * TODO
+ *
+ * - Deploy Bundle
+ *   Take a bundle that provides you with another implementation of 
AuthorizationConfiguration
+ *   and deploy it with your OSGi based Oak setup.
+ *
+ *   Hint: Oak comes with 2 additional authorization models, which you can use
+ *   > Closed User Groups in oak-authorization-cug (see also 
http://jackrabbit.apache.org/oak/docs/security/authorization/cug.html)
+ *   > Read Only in oak-exercise
+ *
+ *   Questions:
+ *   > Can you identify the OSGi components that come with the model?
+ *   > Does your model require any mandatory configuration in order to be 
functional?
+ *
+ * - Adjust Configuration of 'Apache Jackrabbit Oak SecurityProvider'
+ *   In a second step you should adjust the configuration of the 
SecurityProvider
+ *   in order to make sure the additional AuthorizationConfiguration is 
properly
+ *   wired with the security setup.
+ *
+ *   > Add the addition configuration to the list of required service IDs (see 
also http://jackrabbit.apache.org/oak/docs/security/introduction.html)
+ *   > Check the value of 'Authorization Composition Type'.
+ *   > Observe the log INFOs to verify the SecurityProvider is properly 
registered
+ *   > Inspect the references to 'authorizationConfiguration' in 
org.apache.jackrabbit.oak.security.internal.SecurityProviderRegistration
+ * and verify that the extra module shows up there.
+ *
+ * - Verify Access Control Management and Permission Evaluation
+ *   Before moving on think about your expectations wrt result of the 
aggregation
+ *   both in terms of access control management and permission evaluation.
+ *
+ *
+ * Advanced Exercises:
+ * 
-
+ *
+ * - Play with the configuration option 'Authorization Composition Type'.
+ *
+ *   Questions:
+ *   > Would it be an option to use "OR" as the composition type with the 
setup you chose?
+ *   > What would be the result if this was a valid option?
+ *   > If it wasn't an option, explain why. Think about a scenario where it 
was valid.
  *
  * 
  */

svn commit: r1828689 - in /jackrabbit/oak/trunk: oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/ oak-authorization-cug/src/test/java/org/apache/jackr

2018-04-09 Thread stillalex 
Author: stillalex
Date: Mon Apr  9 09:50:21 2018
New Revision: 1828689

URL: http://svn.apache.org/viewvc?rev=1828689=rev
Log:
OAK-7340 Remove SecurityProviderImpl usage from tests


Modified:

jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java

jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java

jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java

jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authorization/composite.md
jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authorization/cug.md

jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authorization/restriction.md
jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/introduction.md

jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/authorizableaction.md

jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/authorizablenodename.md

Modified: 
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java?rev=1828689=1828688=1828689=diff
==
--- 
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java
 Mon Apr  9 09:50:21 2018
@@ -192,13 +192,17 @@ public class CugConfiguration extends Co
 return CugContext.INSTANCE;
 }
 
+@Override
+public void setParameters(ConfigurationParameters config) {
+super.setParameters(config);
+supportedPaths = CugUtil.getSupportedPaths(config, mountInfoProvider);
+}
+
 //< SCR Integration 
>---
 @SuppressWarnings("UnusedDeclaration")
 @Activate
 protected void activate(Map properties) {
-ConfigurationParameters params = 
ConfigurationParameters.of(properties);
-setParameters(params);
-supportedPaths = CugUtil.getSupportedPaths(params, mountInfoProvider);
+setParameters(ConfigurationParameters.of(properties));
 }
 
 @SuppressWarnings("UnusedDeclaration")

Modified: 
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java?rev=1828689=1828688=1828689=diff
==
--- 
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugSecurityProvider.java
 Mon Apr  9 09:50:21 2018
@@ -33,7 +33,7 @@ final class CugSecurityProvider {
 CugConfiguration cugConfiguration = new CugConfiguration();
 
 ConfigurationParameters params = 
configuration.getConfigValue(AuthorizationConfiguration.NAME, 
ConfigurationParameters.EMPTY);
-cugConfiguration.activate(params);
+cugConfiguration.setParameters(params);
 
 SecurityProvider sp = 
SecurityProviderBuilder.newBuilder().with(configuration).build();
 SecurityProviderHelper.updateConfig(sp, cugConfiguration, 
AuthorizationConfiguration.class);

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java?rev=1828689=1828688=1828689=diff
==
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
 Mon Apr  9 09:50:21 2018
@@ -24,11 +24,16 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.oak.AbstractSecurityTest;
 import org.apache.jackrabbit.oak.api.Root;
 import