jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1420212 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: plugins/identifier/IdentifierManager.java plugins/nodetype/ReadOnlyNodeTypeManager.java security/user/OakAuthorizableProperties.java
Date Tue, 11 Dec 2012 15:15:57 GMT
Author: angela
Date: Tue Dec 11 15:15:53 2012
New Revision: 1420212

URL: http://svn.apache.org/viewvc?rev=1420212&view=rev
Log:
OAK-494 	: Cleanup ReadOnlyNodeTypeManager  (Work in Progress)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/OakAuthorizableProperties.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java?rev=1420212&r1=1420211&r2=1420212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
Tue Dec 11 15:15:53 2012
@@ -64,7 +64,7 @@ public class IdentifierManager {
 
     public IdentifierManager(Root root) {
         this.root = root;
-        this.nodeTypeManager = ReadOnlyNodeTypeManager.getInstance(root);
+        this.nodeTypeManager = ReadOnlyNodeTypeManager.getInstance(root, NamePathMapper.DEFAULT);
     }
 
     @Nonnull
@@ -295,5 +295,4 @@ public class IdentifierManager {
             return null;
         }
     }
-
 }
\ No newline at end of file

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java?rev=1420212&r1=1420211&r2=1420212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
Tue Dec 11 15:15:53 2012
@@ -51,6 +51,7 @@ import org.apache.jackrabbit.oak.api.Pro
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.namepath.NameMapper;
+import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl;
 import org.apache.jackrabbit.oak.util.NodeUtil;
 import org.slf4j.Logger;
@@ -130,12 +131,19 @@ public abstract class ReadOnlyNodeTypeMa
      * @return a new instance of {@code ReadOnlyNodeTypeManager}.
      */
     @Nonnull
-    public static ReadOnlyNodeTypeManager getInstance(final Root root) {
+    public static ReadOnlyNodeTypeManager getInstance(final Root root,
+                                                      final NamePathMapper namePathMapper)
{
         return new ReadOnlyNodeTypeManager() {
             @Override
             protected Tree getTypes() {
                 return root.getTree(NODE_TYPES_PATH);
             }
+
+            @Nonnull
+            @Override
+            protected NameMapper getNameMapper() {
+                return namePathMapper;
+            }
         };
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/OakAuthorizableProperties.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/OakAuthorizableProperties.java?rev=1420212&r1=1420211&r2=1420212&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/OakAuthorizableProperties.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/OakAuthorizableProperties.java
Tue Dec 11 15:15:53 2012
@@ -64,7 +64,7 @@ class OakAuthorizableProperties implemen
         this.userProvider = userProvider;
         this.id = id;
         this.namePathMapper = namePathMapper;
-        this.nodeTypeManager = ReadOnlyNodeTypeManager.getInstance(root);
+        this.nodeTypeManager = ReadOnlyNodeTypeManager.getInstance(root, NamePathMapper.DEFAULT);
     }
 
     //---------------------------------------------< AuthorizableProperties >---



Mime
View raw message