svn commit: r1847748 - in /jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite: CrossMountReferenceValidator.java CrossMountReferenceValidatorProvider.java

[tomekr]

Author: tomekr
Date: Thu Nov 29 20:07:54 2018
New Revision: 1847748

URL: http://svn.apache.org/viewvc?rev=1847748&view=rev
Log:
OAK-7725: Allow to have the users and groups created in the immutable part of 
the composite setup

Modified:
    
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
    
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java

Modified: 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java?rev=1847748&r1=1847747&r2=1847748&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
 Thu Nov 29 20:07:54 2018
@@ -156,10 +156,16 @@ public class CrossMountReferenceValidato
         Type<?> type = property.getType();
         if (type == Type.REFERENCE) {
             newReferences.put(property.getValue(Type.REFERENCE), getPath());
+        } else if (type == Type.WEAKREFERENCE) {
+            newReferences.put(property.getValue(Type.WEAKREFERENCE), 
getPath());
         } else if (type == Type.REFERENCES) {
             for (String r : property.getValue(Type.REFERENCES)) {
                 newReferences.put(r, getPath());
             }
+        } else if (type == Type.WEAKREFERENCES) {
+            for (String r : property.getValue(Type.WEAKREFERENCES)) {
+                newReferences.put(r, getPath());
+            }
         } else if (type == Type.STRING && JCR_UUID.equals(property.getName())) 
{
             newReferencableNodes.put(property.getValue(Type.STRING), 
getPath());
         }

Modified: 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java?rev=1847748&r1=1847747&r2=1847748&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java
 Thu Nov 29 20:07:54 2018
@@ -53,6 +53,14 @@ public class CrossMountReferenceValidato
     @Reference
     private MountInfoProvider mountInfoProvider = 
Mounts.defaultMountInfoProvider();
 
+    public CrossMountReferenceValidatorProvider() {
+    }
+
+    public CrossMountReferenceValidatorProvider(MountInfoProvider 
mountInfoProvider, boolean failOnDetection) {
+        this.failOnDetection = failOnDetection;
+        this.mountInfoProvider = mountInfoProvider;
+    }
+
     @Activate
     private void activate(BundleContext bundleContext, Map<String, ?> config) {
         failOnDetection = 
PropertiesUtil.toBoolean(config.get(PROP_FAIL_ON_DETECTION), false);