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

source/java/org/alfresco/repo/security/permissions/impl/PermissionReferenceImpl.java

@@ -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;

source/java/org/alfresco/repo/security/permissions/impl/RequiredPermission.java

@@ -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
     };

source/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java

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

source/java/org/alfresco/repo/security/permissions/impl/model/DynamicPermission.java

@@ -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;

source/java/org/alfresco/repo/security/permissions/impl/model/Permission.java

@@ -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";

source/java/org/alfresco/repo/security/permissions/impl/model/PermissionGroup.java

@@ -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";