svn commit: r986257 - in /jackrabbit/trunk/jackrabbit-core/src/main: java/org/apache/jackrabbit/core/security/user/GroupImpl.java resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd

[md...@apache.org]

Author: mduerig
Date: Tue Aug 17 09:46:52 2010
New Revision: 986257

URL: http://svn.apache.org/viewvc?rev=986257&view=rev
Log:
JCR-2710: Add support for large number of users in a group
rep:Members should not be nt:hierarchyNode

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java?rev=986257&r1=986256&r2=986257&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java Tue Aug 17 09:46:52 2010
@@ -16,28 +16,6 @@
  */
 package org.apache.jackrabbit.core.security.user;
 
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.User;
@@ -53,6 +31,27 @@ import org.apache.jackrabbit.util.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
 /**
  * GroupImpl...
  */
@@ -228,10 +227,6 @@ class GroupImpl extends AuthorizableImpl
         TreeManager treeManager = new BTreeManager(nMembers, minChildren, maxChildren, order,
                 userManager.isAutoSave());
 
-        treeManager.getIgnoredProperties().addAll(Arrays.asList(
-                JcrConstants.JCR_CREATED,
-                "jcr:createdBy"));
-
         return ItemSequence.createPropertySequence(treeManager);
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd?rev=986257&r1=986256&r2=986257&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd Tue Aug 17 09:46:52 2010
@@ -610,7 +610,7 @@
   + * (rep:Authorizable) = rep:User VERSION
   + * (rep:AuthorizableFolder) = rep:AuthorizableFolder VERSION
 
-[rep:Members] > nt:hierarchyNode
+[rep:Members]
   orderable
   + * (rep:Members) = rep:Members multiple
   - * (WEAKREFERENCE) < 'rep:Authorizable'