inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.9 to HEAD

Browse Source 
9018: MT: system-wide jobs should run across all stores/indexes
   9204: Merged V2.2 to V2.9
      8633: Merged V2.1 to V2.2
         8629: Merged V2.1-A to V2.1
            8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
            8494: EHCache and JGroup patches and upgrades
            8546: ACT-1650: performance optimization
            8550: Fixes to transactional cache handling
            8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
            8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
      8640: Merged V2.1 to V2.2
         8638: Used correct exception type for IO channel reopen logic
      9102: Unit test to check that transactional cache size overrun is handled
      9106: Merged V2.1 to V2.2
         9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
         9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
         9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
         9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
         9049: Fix patches to only run once
         9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
         9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
         9061: Fixed NodeRefPropertyMethodInterceptorTest
         9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
         9080: Fixed EHCache source zip
         9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
         9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
      9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
   9206: Merged V2.2 to V2.9
      8857: Improvements to ACL performance for large ACLs
      8951: Always check permission entry changes are made at position 0
   9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
   9220: Added delete permission check when marking a file for delete on close. Port of r9075.
   9222: Merged V2.1 to V2.9
      8683: Early warning for nodes indexed in the wrong store (ACT-964)
      8684: Enhanced tests
      8685: Enhanced tests
      8686: Additional tests
   9223: Merged V2.2 to V2.9
      9120: Merged V2.1 to V2.2
         8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
      9122: Additional unit test from support case.
   9224: Merged V2.2 to V2.9
      9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
      9104: Merged V2.1 to V2.2
         9025: Fixed AR-2314, AR-2299: Optimizations after profiling
      9105: Merged V2.1 to V2.2
         8745: Fix AR-2233 (regression introduced by fix for AR-2221)
      9121: Merged V2.1 to V2.2
         9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
      9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
   9225: Merged V2.1 to V2.9
      8641: Merged V2.1-A to V2.1
         7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
      8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
      8682: Fix for AR-2005
      8695: AR-2054.
      8696: Improved sort test to include prefix form of field name
   9226: Fix ALFCOM-994 (see also earlier change in r9223)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-22 12:40:46 +00:00
parent 86027f41f1
commit 6e225ce15d
60 changed files with 2359 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
View File

@@ -25,6 +25,7 @@
package org.alfresco.repo.security.permissions.impl;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -344,7 +345,7 @@ public class PermissionServiceTest extends AbstractPermissionTest
public void testSetNodePermissionEntry()
{
runAs("andy");
Set<SimplePermissionEntry> entries = new HashSet<SimplePermissionEntry>();
ArrayList<SimplePermissionEntry> entries = new ArrayList<SimplePermissionEntry>();
entries.add(new SimplePermissionEntry(rootNodeRef, new SimplePermissionReference(QName.createQName("A", "B"), "C"), "user-one", AccessStatus.ALLOWED));
entries.add(new SimplePermissionEntry(rootNodeRef, permissionService.getAllPermissionReference(), "user-two", AccessStatus.ALLOWED));
entries.add(new SimplePermissionEntry(rootNodeRef, new SimplePermissionReference(QName.createQName("D", "E"), "F"), permissionService.getAllAuthorities(),
@@ -363,7 +364,7 @@ public class PermissionServiceTest extends AbstractPermissionTest
public void testSetNodePermissionEntry2()
{
Set<SimplePermissionEntry> entries = new HashSet<SimplePermissionEntry>();
ArrayList<SimplePermissionEntry> entries = new ArrayList<SimplePermissionEntry>();
entries.add(new SimplePermissionEntry(rootNodeRef, permissionService.getAllPermissionReference(), permissionService.getAllAuthorities(), AccessStatus.ALLOWED));
SimpleNodePermissionEntry entry = new SimpleNodePermissionEntry(rootNodeRef, false, entries);
@@ -386,7 +387,7 @@ public class PermissionServiceTest extends AbstractPermissionTest
public void testDoubleSetAllowDeny()
{
Set<? extends PermissionEntry> permissionEntries = null;
List<? extends PermissionEntry> permissionEntries = null;
// add-remove andy-all
permissionService.setPermission(rootNodeRef, "andy", permissionService.getAllPermission(), true);
permissionService.setPermission(rootNodeRef, "andy", permissionService.getAllPermission(), false);

8
source/java/org/alfresco/repo/security/permissions/impl/SimpleNodePermissionEntry.java
View File

@@ -25,6 +25,8 @@
package org.alfresco.repo.security.permissions.impl;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import org.alfresco.repo.security.permissions.PermissionEntry;
@@ -55,10 +57,10 @@ public final class SimpleNodePermissionEntry extends AbstractNodePermissionEntry
/*
* The set of permission entries.
*/
private Set<? extends PermissionEntry> permissionEntries;
private List<? extends PermissionEntry> permissionEntries;
public SimpleNodePermissionEntry(NodeRef nodeRef, boolean inheritPermissions, Set<? extends PermissionEntry> permissionEntries)
public SimpleNodePermissionEntry(NodeRef nodeRef, boolean inheritPermissions, List<? extends PermissionEntry> permissionEntries)
{
super();
this.nodeRef = nodeRef;
@@ -76,7 +78,7 @@ public final class SimpleNodePermissionEntry extends AbstractNodePermissionEntry
return inheritPermissions;
}
public Set<? extends PermissionEntry> getPermissionEntries()
public List<? extends PermissionEntry> getPermissionEntries()
{
return permissionEntries;
}

17
source/java/org/alfresco/repo/security/permissions/impl/SimplePermissionEntry.java
View File

@@ -56,9 +56,14 @@ public final class SimplePermissionEntry extends AbstractPermissionEntry
*/
private AccessStatus accessStatus;
private int position;
public SimplePermissionEntry(NodeRef nodeRef, PermissionReference permissionReference, String authority, AccessStatus accessStatus)
{
this(nodeRef, permissionReference, authority, accessStatus, 0);
}
public SimplePermissionEntry(NodeRef nodeRef, PermissionReference permissionReference, String authority, AccessStatus accessStatus, int position)
{
super();
this.nodeRef = nodeRef;
@@ -97,4 +102,14 @@ public final class SimplePermissionEntry extends AbstractPermissionEntry
return accessStatus;
}
public int getPosition()
{
return position;
}
public boolean isInherited()
{
return position > 0;
}
}

10
source/java/org/alfresco/repo/security/permissions/impl/model/GlobalPermissionEntry.java
View File

@@ -93,4 +93,14 @@ public class GlobalPermissionEntry implements XMLModelInitialisable, PermissionE
return AccessStatus.ALLOWED;
}
public int getPosition()
{
return 0;
}
public boolean isInherited()
{
return false;
}
}

10
source/java/org/alfresco/repo/security/permissions/impl/model/ModelPermissionEntry.java
View File

@@ -155,4 +155,14 @@ public class ModelPermissionEntry implements PermissionEntry, XMLModelInitialisa
String name = permissionReferenceElement.attributeValue(NAME);
permissionReference = PermissionReferenceImpl.getPermissionReference(typeQName, name);
}
public int getPosition()
{
return 0;
}
public boolean isInherited()
{
return false;
}
}

8
source/java/org/alfresco/repo/security/permissions/impl/model/NodePermission.java
View File

@@ -24,9 +24,11 @@
*/
package org.alfresco.repo.security.permissions.impl.model;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.alfresco.repo.security.permissions.NodePermissionEntry;
@@ -55,7 +57,7 @@ public class NodePermission implements NodePermissionEntry, XMLModelInitialisabl
// If null then it is the root.
private NodeRef nodeRef;
private Set<PermissionEntry> permissionEntries = new HashSet<PermissionEntry>();
private List<PermissionEntry> permissionEntries = new ArrayList<PermissionEntry>();
private boolean inheritPermissionsFromParent;
@@ -74,9 +76,9 @@ public class NodePermission implements NodePermissionEntry, XMLModelInitialisabl
return inheritPermissionsFromParent;
}
public Set<PermissionEntry> getPermissionEntries()
public List<PermissionEntry> getPermissionEntries()
{
return Collections.unmodifiableSet(permissionEntries);
return Collections.unmodifiableList(permissionEntries);
}
public void initialise(Element element, NamespacePrefixResolver nspr, PermissionModel permissionModel)