Merged V2.2 to HEAD

7690: Build fix
   7694: AVM permissions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-06 21:53:29 +00:00
parent ecb74c1447
commit 4fc796b4a3
29 changed files with 658 additions and 34 deletions

View File

@@ -24,9 +24,11 @@
*/
package org.alfresco.repo.security.permissions;
import java.io.Serializable;
import org.alfresco.service.cmr.security.AccessStatus;
public interface AccessControlEntry extends Comparable<AccessControlEntry>
public interface AccessControlEntry extends Comparable<AccessControlEntry>, Serializable
{
public Integer getPosition();

View File

@@ -24,7 +24,9 @@
*/
package org.alfresco.repo.security.permissions;
public interface AccessControlEntryContext
import java.io.Serializable;
public interface AccessControlEntryContext extends Serializable
{
/**
* Get the class context.

View File

@@ -24,9 +24,10 @@
*/
package org.alfresco.repo.security.permissions;
import java.io.Serializable;
import java.util.List;
public interface AccessControlList
public interface AccessControlList extends Serializable
{
/**
* Get the properties

View File

@@ -24,8 +24,10 @@
*/
package org.alfresco.repo.security.permissions;
import java.io.Serializable;
public interface AccessControlListProperties
public interface AccessControlListProperties extends Serializable
{
/**
* Get the ACL ID

View File

@@ -24,6 +24,8 @@
*/
package org.alfresco.repo.security.permissions;
import java.io.Serializable;
import org.alfresco.service.namespace.QName;
/**
@@ -32,7 +34,7 @@ import org.alfresco.service.namespace.QName;
*
* @author Andy Hind
*/
public interface PermissionReference
public interface PermissionReference extends Serializable
{
/**

View File

@@ -29,6 +29,11 @@ import org.alfresco.service.cmr.security.AuthorityType;
public class SimpleAccessControlEntry implements AccessControlEntry
{
/**
*
*/
private static final long serialVersionUID = -3099789485179796034L;
private AccessStatus accessStatus;
private ACEType aceType;

View File

@@ -27,6 +27,11 @@ package org.alfresco.repo.security.permissions;
public class SimpleAccessControlEntryContext implements AccessControlEntryContext
{
/**
*
*/
private static final long serialVersionUID = -5679179194140822827L;
private String classContext;
private String KVPContext;

View File

@@ -5,6 +5,11 @@ import java.util.List;
public class SimpleAccessControlList implements AccessControlList
{
/**
*
*/
private static final long serialVersionUID = -1859514919998903150L;
private AccessControlListProperties properties;
private List<AccessControlEntry> entries = new ArrayList<AccessControlEntry>();

View File

@@ -26,6 +26,11 @@ package org.alfresco.repo.security.permissions;
public class SimpleAccessControlListProperties implements AccessControlListProperties
{
/**
*
*/
private static final long serialVersionUID = 6476760867405494520L;
private String aclId;
private ACLType aclType;

View File

@@ -35,6 +35,11 @@ import org.alfresco.service.namespace.QName;
*/
public class PermissionReferenceImpl extends AbstractPermissionReference
{
/**
*
*/
private static final long serialVersionUID = -8639601925783501443L;
private QName qName;
private String name;

View File

@@ -33,6 +33,11 @@ import org.alfresco.service.namespace.QName;
*/
public final class RequiredPermission extends PermissionReferenceImpl
{
/**
*
*/
private static final long serialVersionUID = 4840771159714835909L;
public enum On {
PARENT, NODE, CHILDREN
};

View File

@@ -33,6 +33,11 @@ import org.alfresco.service.namespace.QName;
*/
public final class SimplePermissionReference extends AbstractPermissionReference
{
/**
*
*/
private static final long serialVersionUID = 637302438293417818L;
/*
* The type
*/

View File

@@ -35,6 +35,11 @@ import org.dom4j.Element;
*/
public class DynamicPermission extends AbstractPermission implements XMLModelInitialisable
{
/**
*
*/
private static final long serialVersionUID = 8060533686472973313L;
private static final String EVALUATOR = "evaluator";
private String evaluatorFullyQualifiedClassName;

View File

@@ -46,6 +46,11 @@ public class Permission extends AbstractPermission implements XMLModelInitialisa
{
// XML Constants
/**
*
*/
private static final long serialVersionUID = -4560426591597681329L;
private static final String GRANTED_TO_GROUP = "grantedToGroup";
private static final String GTG_NAME = "permissionGroup";

View File

@@ -46,6 +46,11 @@ public final class PermissionGroup extends AbstractPermissionReference implement
{
// XML Constants
/**
*
*/
private static final long serialVersionUID = 7879839657714155737L;
private static final String NAME = "name";
private static final String EXTENDS = "extends";