[380629] Design a default Security model

https://bugs.eclipse.org/bugs/show_bug.cgi?id=380629
author: Eike Stepper 2012-06-12 08:59:13 +0000
committer: Eike Stepper 2012-06-12 08:59:13 +0000
commit: cc7297c466f9b2d42d859161f04693840d1a2a1a (patch)
tree: d66ec90f093147bc630d353264fcc7b2cfa1f6db
parent: c049a4699cf639cf223189d564b47eea2dc19ddd (diff)
download: cdo-cc7297c466f9b2d42d859161f04693840d1a2a1a.tar.gz
cdo-cc7297c466f9b2d42d859161f04693840d1a2a1a.tar.xz
cdo-cc7297c466f9b2d42d859161f04693840d1a2a1a.zip
39 files changed, 751 insertions, 745 deletions
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassCheck.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassPermission.gif
index 2b8da630d8..2b8da630d8 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassCheck.gif
+++ b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassPermission.gif
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackageCheck.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackagePermission.gif
index 30c5c10cc4..30c5c10cc4 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackageCheck.gif
+++ b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackagePermission.gif
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourceCheck.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourcePermission.gif
index 27c7cbbe48..27c7cbbe48 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourceCheck.gif
+++ b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourcePermission.gif
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties
index eff33b4dbf..d1af9e7a5d 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties
@@ -65,32 +65,24 @@ _UI_User_allGroups_feature = All Groups
 _UI_User_allRoles_feature = All Roles
 _UI_User_label_feature = Label
 _UI_Group_allInheritingGroups_feature = All Inheriting Groups
-_UI_Check_type = Check
-_UI_ClassCheck_type = Class Check
-_UI_PackageCheck_type = Package Check
-_UI_ResourceCheck_type = Resource Check
-_UI_Role_checks_feature = Checks
-_UI_Check_role_feature = Role
-_UI_Check_permission_feature = Permission
-_UI_ClassCheck_classes_feature = Classes
-_UI_PackageCheck_packages_feature = Packages
-_UI_ResourceCheck_pattern_feature = Pattern
-_UI_Permission_READ_literal = READ
-_UI_Permission_WRITE_literal = WRITE
 _UI_Realm_allUsers_feature = All Users
 _UI_Realm_allGroups_feature = All Groups
 _UI_Realm_allRoles_feature = All Roles
-_UI_Realm_allChecks_feature = All Checks
 _UI_User_unassignedRoles_feature = Unassigned Roles
-_UI_Realm_defaultPermission_feature = Default Permission
-_UI_User_defaultPermissionOverride_feature = Default Permission Override
-_UI_User_defaultPermission_feature = Default Permission
-_UI_User_allChecks_feature = All Checks
-_UI_ClassCheck_applicableClass_feature = Applicable Class
-_UI_PackageCheck_applicablePackage_feature = Applicable Package
 _UI_Realm_defaultAccess_feature = Default Access
 _UI_User_defaultAccessOverride_feature = Default Access Override
 _UI_User_defaultAccess_feature = Default Access
-_UI_Check_access_feature = Access
 _UI_Access_READ_literal = READ
 _UI_Access_WRITE_literal = WRITE
+_UI_Permission_type = Permission
+_UI_ClassPermission_type = Class Permission
+_UI_PackagePermission_type = Package Permission
+_UI_ResourcePermission_type = Resource Permission
+_UI_Realm_allPermissions_feature = All Permissions
+_UI_Role_permissions_feature = Permissions
+_UI_User_allPermissions_feature = All Permissions
+_UI_Permission_role_feature = Role
+_UI_Permission_access_feature = Access
+_UI_ClassPermission_applicableClass_feature = Applicable Class
+_UI_PackagePermission_applicablePackage_feature = Applicable Package
+_UI_ResourcePermission_pattern_feature = Pattern
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassCheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
index 01791ad1cb..5e43cf1e75 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassCheckItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
@@ -3,7 +3,7 @@
 package org.eclipse.emf.cdo.security.provider;
 
 import org.eclipse.emf.cdo.security.Access;
-import org.eclipse.emf.cdo.security.ClassCheck;
+import org.eclipse.emf.cdo.security.ClassPermission;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -26,12 +26,12 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ClassCheck} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ClassPermission} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ClassCheckItemProvider extends CheckItemProvider implements IEditingDomainItemProvider,
+public class ClassPermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
@@ -41,7 +41,7 @@ public class ClassCheckItemProvider extends CheckItemProvider implements IEditin
    * <!-- end-user-doc -->
    * @generated
    */
-  public ClassCheckItemProvider(AdapterFactory adapterFactory)
+  public ClassPermissionItemProvider(AdapterFactory adapterFactory)
   {
     super(adapterFactory);
   }
@@ -75,14 +75,14 @@ public class ClassCheckItemProvider extends CheckItemProvider implements IEditin
     itemPropertyDescriptors
         .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
             getResourceLocator(),
-            getString("_UI_ClassCheck_applicableClass_feature"), //$NON-NLS-1$
+            getString("_UI_ClassPermission_applicableClass_feature"), //$NON-NLS-1$
             getString(
-                "_UI_PropertyDescriptor_description", "_UI_ClassCheck_applicableClass_feature", "_UI_ClassCheck_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.CLASS_CHECK__APPLICABLE_CLASS, true, false, true, null, null, null));
+                "_UI_PropertyDescriptor_description", "_UI_ClassPermission_applicableClass_feature", "_UI_ClassPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, true, false, true, null, null, null));
   }
 
   /**
-   * This returns ClassCheck.gif.
+   * This returns ClassPermission.gif.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -90,7 +90,7 @@ public class ClassCheckItemProvider extends CheckItemProvider implements IEditin
   @Override
   public Object getImage(Object object)
   {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/ClassCheck")); //$NON-NLS-1$
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/ClassPermission")); //$NON-NLS-1$
   }
 
   /**
@@ -113,8 +113,8 @@ public class ClassCheckItemProvider extends CheckItemProvider implements IEditin
   @Override
   public String getText(Object object)
   {
-    Access labelValue = ((ClassCheck)object).getAccess();
-    EClass applicableClass = ((ClassCheck)object).getApplicableClass();
+    Access labelValue = ((ClassPermission)object).getAccess();
+    EClass applicableClass = ((ClassPermission)object).getApplicableClass();
     String label = labelValue == null ? null : labelValue.toString();
 
     if (applicableClass != null)
@@ -122,7 +122,7 @@ public class ClassCheckItemProvider extends CheckItemProvider implements IEditin
       label += " " + applicableClass.getName();
     }
 
-    return label == null || label.length() == 0 ? getString("_UI_ClassCheck_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_ClassPermission_type") : //$NON-NLS-1$
         label;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageCheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
index 8fa3740e86..98b1126a61 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageCheckItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
@@ -2,7 +2,7 @@
  */
 package org.eclipse.emf.cdo.security.provider;
 
-import org.eclipse.emf.cdo.security.PackageCheck;
+import org.eclipse.emf.cdo.security.PackagePermission;
 import org.eclipse.emf.cdo.security.Access;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
@@ -25,12 +25,12 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.PackageCheck} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.PackagePermission} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class PackageCheckItemProvider extends CheckItemProvider implements IEditingDomainItemProvider,
+public class PackagePermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
@@ -40,7 +40,7 @@ public class PackageCheckItemProvider extends CheckItemProvider implements IEdit
    * <!-- end-user-doc -->
    * @generated
    */
-  public PackageCheckItemProvider(AdapterFactory adapterFactory)
+  public PackagePermissionItemProvider(AdapterFactory adapterFactory)
   {
     super(adapterFactory);
   }
@@ -74,14 +74,14 @@ public class PackageCheckItemProvider extends CheckItemProvider implements IEdit
     itemPropertyDescriptors
         .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
             getResourceLocator(),
-            getString("_UI_PackageCheck_applicablePackage_feature"), //$NON-NLS-1$
+            getString("_UI_PackagePermission_applicablePackage_feature"), //$NON-NLS-1$
             getString(
-                "_UI_PropertyDescriptor_description", "_UI_PackageCheck_applicablePackage_feature", "_UI_PackageCheck_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            SecurityPackage.Literals.PACKAGE_CHECK__APPLICABLE_PACKAGE, true, false, true, null, null, null));
+                "_UI_PropertyDescriptor_description", "_UI_PackagePermission_applicablePackage_feature", "_UI_PackagePermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, true, false, true, null, null, null));
   }
 
   /**
-   * This returns PackageCheck.gif.
+   * This returns PackagePermission.gif.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -89,7 +89,7 @@ public class PackageCheckItemProvider extends CheckItemProvider implements IEdit
   @Override
   public Object getImage(Object object)
   {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/PackageCheck")); //$NON-NLS-1$
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/PackagePermission")); //$NON-NLS-1$
   }
 
   /**
@@ -112,10 +112,10 @@ public class PackageCheckItemProvider extends CheckItemProvider implements IEdit
   @Override
   public String getText(Object object)
   {
-    Access labelValue = ((PackageCheck)object).getAccess();
+    Access labelValue = ((PackagePermission)object).getAccess();
     String label = labelValue == null ? null : labelValue.toString();
-    return label == null || label.length() == 0 ? getString("_UI_PackageCheck_type") : //$NON-NLS-1$
-        getString("_UI_PackageCheck_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+    return label == null || label.length() == 0 ? getString("_UI_PackagePermission_type") : //$NON-NLS-1$
+        getString("_UI_PackagePermission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
index 902eb8e391..9ce0d8c817 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CheckItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
@@ -2,7 +2,7 @@
  */
 package org.eclipse.emf.cdo.security.provider;
 
-import org.eclipse.emf.cdo.security.Check;
+import org.eclipse.emf.cdo.security.Permission;
 import org.eclipse.emf.cdo.security.Access;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
@@ -30,12 +30,12 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.Check} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.Permission} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class CheckItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+public class PermissionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
@@ -45,7 +45,7 @@ public class CheckItemProvider extends ItemProviderAdapter implements IEditingDo
    * <!-- end-user-doc -->
    * @generated
    */
-  public CheckItemProvider(AdapterFactory adapterFactory)
+  public PermissionItemProvider(AdapterFactory adapterFactory)
   {
     super(adapterFactory);
   }
@@ -79,10 +79,10 @@ public class CheckItemProvider extends ItemProviderAdapter implements IEditingDo
     itemPropertyDescriptors.add(createItemPropertyDescriptor(
         ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
         getResourceLocator(),
-        getString("_UI_Check_access_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Check_access_feature", "_UI_Check_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.CHECK__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+        getString("_UI_Permission_access_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Permission_access_feature", "_UI_Permission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.PERMISSION__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+        null, null));
   }
 
   /**
@@ -116,10 +116,10 @@ public class CheckItemProvider extends ItemProviderAdapter implements IEditingDo
   @Override
   public String getText(Object object)
   {
-    Access labelValue = ((Check)object).getAccess();
+    Access labelValue = ((Permission)object).getAccess();
     String label = labelValue == null ? null : labelValue.toString();
-    return label == null || label.length() == 0 ? getString("_UI_Check_type") : //$NON-NLS-1$
-        getString("_UI_Check_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+    return label == null || label.length() == 0 ? getString("_UI_Permission_type") : //$NON-NLS-1$
+        getString("_UI_Permission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
@@ -134,9 +134,9 @@ public class CheckItemProvider extends ItemProviderAdapter implements IEditingDo
   {
     updateChildren(notification);
 
-    switch (notification.getFeatureID(Check.class))
+    switch (notification.getFeatureID(Permission.class))
     {
-    case SecurityPackage.CHECK__ACCESS:
+    case SecurityPackage.PERMISSION__ACCESS:
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
       return;
     }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
index 27d728c955..c13be5943c 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
@@ -69,6 +69,7 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
     {
       super.getPropertyDescriptors(object);
 
+      addAllPermissionsPropertyDescriptor(object);
       addNamePropertyDescriptor(object);
       addDefaultAccessPropertyDescriptor(object);
     }
@@ -76,6 +77,21 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
   }
 
   /**
+   * This adds a property descriptor for the All Permissions feature.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected void addAllPermissionsPropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(
+        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Realm_allPermissions_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_Realm_allPermissions_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.REALM__ALL_PERMISSIONS, false, false, false, null, null, null));
+  }
+
+  /**
    * This adds a property descriptor for the Name feature.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceCheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
index 89b371b20f..15383a360c 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceCheckItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
@@ -3,7 +3,7 @@
 package org.eclipse.emf.cdo.security.provider;
 
 import org.eclipse.emf.cdo.security.Access;
-import org.eclipse.emf.cdo.security.ResourceCheck;
+import org.eclipse.emf.cdo.security.ResourcePermission;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -27,12 +27,12 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ResourceCheck} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ResourcePermission} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ResourceCheckItemProvider extends CheckItemProvider implements IEditingDomainItemProvider,
+public class ResourcePermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
@@ -42,7 +42,7 @@ public class ResourceCheckItemProvider extends CheckItemProvider implements IEdi
    * <!-- end-user-doc -->
    * @generated
    */
-  public ResourceCheckItemProvider(AdapterFactory adapterFactory)
+  public ResourcePermissionItemProvider(AdapterFactory adapterFactory)
   {
     super(adapterFactory);
   }
@@ -73,17 +73,19 @@ public class ResourceCheckItemProvider extends CheckItemProvider implements IEdi
    */
   protected void addPatternPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_ResourceCheck_pattern_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_ResourceCheck_pattern_feature", "_UI_ResourceCheck_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.RESOURCE_CHECK__PATTERN, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(
+            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(),
+            getString("_UI_ResourcePermission_pattern_feature"), //$NON-NLS-1$
+            getString(
+                "_UI_PropertyDescriptor_description", "_UI_ResourcePermission_pattern_feature", "_UI_ResourcePermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
-   * This returns ResourceCheck.gif.
+   * This returns ResourcePermission.gif.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -91,7 +93,7 @@ public class ResourceCheckItemProvider extends CheckItemProvider implements IEdi
   @Override
   public Object getImage(Object object)
   {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/ResourceCheck")); //$NON-NLS-1$
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/ResourcePermission")); //$NON-NLS-1$
   }
 
   /**
@@ -114,10 +116,10 @@ public class ResourceCheckItemProvider extends CheckItemProvider implements IEdi
   @Override
   public String getText(Object object)
   {
-    Access labelValue = ((ResourceCheck)object).getAccess();
+    Access labelValue = ((ResourcePermission)object).getAccess();
     String label = labelValue == null ? null : labelValue.toString();
-    return label == null || label.length() == 0 ? getString("_UI_ResourceCheck_type") : //$NON-NLS-1$
-        getString("_UI_ResourceCheck_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+    return label == null || label.length() == 0 ? getString("_UI_ResourcePermission_type") : //$NON-NLS-1$
+        getString("_UI_ResourcePermission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
@@ -132,9 +134,9 @@ public class ResourceCheckItemProvider extends CheckItemProvider implements IEdi
   {
     updateChildren(notification);
 
-    switch (notification.getFeatureID(ResourceCheck.class))
+    switch (notification.getFeatureID(ResourcePermission.class))
     {
-    case SecurityPackage.RESOURCE_CHECK__PATTERN:
+    case SecurityPackage.RESOURCE_PERMISSION__PATTERN:
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
       return;
     }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
index fc456262b5..30bd474a99 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
@@ -119,7 +119,7 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi
     if (childrenFeatures == null)
     {
       super.getChildrenFeatures(object);
-      childrenFeatures.add(SecurityPackage.Literals.ROLE__CHECKS);
+      childrenFeatures.add(SecurityPackage.Literals.ROLE__PERMISSIONS);
     }
     return childrenFeatures;
   }
@@ -192,7 +192,7 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi
     case SecurityPackage.ROLE__ID:
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
       return;
-    case SecurityPackage.ROLE__CHECKS:
+    case SecurityPackage.ROLE__PERMISSIONS:
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
       return;
     }
@@ -211,14 +211,14 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__CHECKS,
-        SecurityFactory.eINSTANCE.createClassCheck()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS,
+        SecurityFactory.eINSTANCE.createClassPermission()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__CHECKS,
-        SecurityFactory.eINSTANCE.createPackageCheck()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS,
+        SecurityFactory.eINSTANCE.createPackagePermission()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__CHECKS,
-        SecurityFactory.eINSTANCE.createResourceCheck()));
+    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS,
+        SecurityFactory.eINSTANCE.createResourcePermission()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
index e48f472ca7..73ff95d240 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
@@ -257,78 +257,78 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory i
   }
 
   /**
-   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ClassCheck} instances.
+   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ClassPermission} instances.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected ClassCheckItemProvider classCheckItemProvider;
+  protected ClassPermissionItemProvider classPermissionItemProvider;
 
   /**
-   * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ClassCheck}.
+   * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ClassPermission}.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
   @Override
-  public Adapter createClassCheckAdapter()
+  public Adapter createClassPermissionAdapter()
   {
-    if (classCheckItemProvider == null)
+    if (classPermissionItemProvider == null)
     {
-      classCheckItemProvider = new ClassCheckItemProvider(this);
+      classPermissionItemProvider = new ClassPermissionItemProvider(this);
     }
 
-    return classCheckItemProvider;
+    return classPermissionItemProvider;
   }
 
   /**
-   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.PackageCheck} instances.
+   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.PackagePermission} instances.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected PackageCheckItemProvider packageCheckItemProvider;
+  protected PackagePermissionItemProvider packagePermissionItemProvider;
 
   /**
-   * This creates an adapter for a {@link org.eclipse.emf.cdo.security.PackageCheck}.
+   * This creates an adapter for a {@link org.eclipse.emf.cdo.security.PackagePermission}.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
   @Override
-  public Adapter createPackageCheckAdapter()
+  public Adapter createPackagePermissionAdapter()
   {
-    if (packageCheckItemProvider == null)
+    if (packagePermissionItemProvider == null)
     {
-      packageCheckItemProvider = new PackageCheckItemProvider(this);
+      packagePermissionItemProvider = new PackagePermissionItemProvider(this);
     }
 
-    return packageCheckItemProvider;
+    return packagePermissionItemProvider;
   }
 
   /**
-   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ResourceCheck} instances.
+   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ResourcePermission} instances.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected ResourceCheckItemProvider resourceCheckItemProvider;
+  protected ResourcePermissionItemProvider resourcePermissionItemProvider;
 
   /**
-   * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ResourceCheck}.
+   * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ResourcePermission}.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
   @Override
-  public Adapter createResourceCheckAdapter()
+  public Adapter createResourcePermissionAdapter()
   {
-    if (resourceCheckItemProvider == null)
+    if (resourcePermissionItemProvider == null)
     {
-      resourceCheckItemProvider = new ResourceCheckItemProvider(this);
+      resourcePermissionItemProvider = new ResourcePermissionItemProvider(this);
     }
 
-    return resourceCheckItemProvider;
+    return resourcePermissionItemProvider;
   }
 
   /**
@@ -484,12 +484,12 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory i
       userItemProvider.dispose();
     if (userPasswordItemProvider != null)
       userPasswordItemProvider.dispose();
-    if (classCheckItemProvider != null)
-      classCheckItemProvider.dispose();
-    if (packageCheckItemProvider != null)
-      packageCheckItemProvider.dispose();
-    if (resourceCheckItemProvider != null)
-      resourceCheckItemProvider.dispose();
+    if (classPermissionItemProvider != null)
+      classPermissionItemProvider.dispose();
+    if (packagePermissionItemProvider != null)
+      packagePermissionItemProvider.dispose();
+    if (resourcePermissionItemProvider != null)
+      resourcePermissionItemProvider.dispose();
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
index f52a72ab16..395e00c3fc 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
@@ -77,6 +77,7 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
       addDefaultAccessOverridePropertyDescriptor(object);
       addDefaultAccessPropertyDescriptor(object);
       addLockedPropertyDescriptor(object);
+      addAllPermissionsPropertyDescriptor(object);
     }
     return itemPropertyDescriptors;
   }
@@ -216,6 +217,21 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
   }
 
   /**
+   * This adds a property descriptor for the All Permissions feature.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected void addAllPermissionsPropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(
+        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_User_allPermissions_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_User_allPermissions_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        SecurityPackage.Literals.USER__ALL_PERMISSIONS, false, false, false, null, null, null));
+  }
+
+  /**
    * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
diff --git a/plugins/org.eclipse.emf.cdo.security/model/security.ecore b/plugins/org.eclipse.emf.cdo.security/model/security.ecore
index 5a5b384029..a733028ff1 100644
--- a/plugins/org.eclipse.emf.cdo.security/model/security.ecore
+++ b/plugins/org.eclipse.emf.cdo.security/model/security.ecore
@@ -15,8 +15,9 @@
         eType="#//Group" changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="allRoles" upperBound="-1"
         eType="#//Role" changeable="false" volatile="true" transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="allChecks" upperBound="-1"
-        eType="#//Check" changeable="false" volatile="true" transient="true" derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="allPermissions" upperBound="-1"
+        eType="#//Permission" changeable="false" volatile="true" transient="true"
+        derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultAccess" eType="#//AccessObject"/>
   </eClassifiers>
@@ -27,8 +28,8 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//SecurityItem">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="checks" upperBound="-1"
-        eType="#//Check" containment="true" eOpposite="#//Check/role"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"
+        eType="#//Permission" containment="true" eOpposite="#//Permission/role"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="assignees" upperBound="-1"
         eType="#//Assignee" eOpposite="#//Assignee/roles"/>
   </eClassifiers>
@@ -70,29 +71,30 @@
         eType="#//Group" changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="allRoles" upperBound="-1"
         eType="#//Role" changeable="false" volatile="true" transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="allChecks" upperBound="-1"
-        eType="#//Check" changeable="false" volatile="true" transient="true" derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="allPermissions" upperBound="-1"
+        eType="#//Permission" changeable="false" volatile="true" transient="true"
+        derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="unassignedRoles" upperBound="-1"
         eType="#//Role" changeable="false" volatile="true" transient="true" derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="UserPassword">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="encrypted" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Check" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="Permission" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="role" lowerBound="1" eType="#//Role"
-        eOpposite="#//Role/checks"/>
+        eOpposite="#//Role/permissions"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" lowerBound="1"
         eType="#//Access" defaultValueLiteral="WRITE"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ClassCheck" eSuperTypes="#//Check">
+  <eClassifiers xsi:type="ecore:EClass" name="ClassPermission" eSuperTypes="#//Permission">
     <eStructuralFeatures xsi:type="ecore:EReference" name="applicableClass" lowerBound="1"
         eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PackageCheck" eSuperTypes="#//Check">
+  <eClassifiers xsi:type="ecore:EClass" name="PackagePermission" eSuperTypes="#//Permission">
     <eStructuralFeatures xsi:type="ecore:EReference" name="applicablePackage" lowerBound="1"
         eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceCheck" eSuperTypes="#//Check">
+  <eClassifiers xsi:type="ecore:EClass" name="ResourcePermission" eSuperTypes="#//Permission">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="Access">
diff --git a/plugins/org.eclipse.emf.cdo.security/model/security.ecorediag b/plugins/org.eclipse.emf.cdo.security/model/security.ecorediag
index 0fd59ec9ec..4a0a136933 100644
--- a/plugins/org.eclipse.emf.cdo.security/model/security.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.security/model/security.ecorediag
@@ -36,26 +36,6 @@
     <element xmi:type="ecore:EClass" href="security.ecore#//SecurityItem"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlxipKwpEeGqBf0LMO47dg" x="236" y="136"/>
   </children>
-  <children xmi:type="notation:Node" xmi:id="_BlyJuawpEeGqBf0LMO47dg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_BlyJvKwpEeGqBf0LMO47dg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_BlywwKwpEeGqBf0LMO47dg" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_BlywyKwpEeGqBf0LMO47dg" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//Realm/name"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BlywyawpEeGqBf0LMO47dg"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_BlywwawpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_BlywwqwpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Blyww6wpEeGqBf0LMO47dg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_BlywxKwpEeGqBf0LMO47dg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_BlywxawpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_BlywxqwpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Blywx6wpEeGqBf0LMO47dg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_BlyJuqwpEeGqBf0LMO47dg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="security.ecore#//Realm"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BlyJu6wpEeGqBf0LMO47dg" x="457" y="132"/>
-  </children>
   <children xmi:type="notation:Node" xmi:id="_BlywyqwpEeGqBf0LMO47dg" type="1001">
     <children xmi:type="notation:Node" xmi:id="_BlzX0KwpEeGqBf0LMO47dg" type="4001"/>
     <children xmi:type="notation:Node" xmi:id="_BlzX0awpEeGqBf0LMO47dg" type="5001">
@@ -132,42 +112,6 @@
     <element xmi:type="ecore:EClass" href="security.ecore#//Group"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bl1NBKwpEeGqBf0LMO47dg" x="380" y="373"/>
   </children>
-  <children xmi:type="notation:Node" xmi:id="_Bl2bIKwpEeGqBf0LMO47dg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Bl2bI6wpEeGqBf0LMO47dg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Bl2bJKwpEeGqBf0LMO47dg" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_Bl3CMKwpEeGqBf0LMO47dg" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//User/label"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl3CMawpEeGqBf0LMO47dg"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_Bl3CMqwpEeGqBf0LMO47dg" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//User/firstName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl3CM6wpEeGqBf0LMO47dg"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_Bl3CNKwpEeGqBf0LMO47dg" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//User/lastName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl3CNawpEeGqBf0LMO47dg"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_Bl3CNqwpEeGqBf0LMO47dg" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//User/email"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl3CN6wpEeGqBf0LMO47dg"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_Bl3COKwpEeGqBf0LMO47dg" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//User/locked"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl3COawpEeGqBf0LMO47dg"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bl2bJawpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Bl2bJqwpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bl2bJ6wpEeGqBf0LMO47dg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Bl2bKKwpEeGqBf0LMO47dg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bl2bKawpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Bl2bKqwpEeGqBf0LMO47dg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bl2bK6wpEeGqBf0LMO47dg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Bl2bIawpEeGqBf0LMO47dg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="security.ecore#//User"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bl2bIqwpEeGqBf0LMO47dg" x="25" y="373"/>
-  </children>
   <children xmi:type="notation:Node" xmi:id="_Bl3pQKwpEeGqBf0LMO47dg" type="1001">
     <children xmi:type="notation:Node" xmi:id="_Bl3pQ6wpEeGqBf0LMO47dg" type="4001"/>
     <children xmi:type="notation:Node" xmi:id="_Bl3pRKwpEeGqBf0LMO47dg" type="5001">
@@ -192,7 +136,7 @@
     <children xmi:type="notation:Node" xmi:id="_PWKVMLIPEeGyraMqKGwiUw" type="4001"/>
     <children xmi:type="notation:Node" xmi:id="_PWMKYLIPEeGyraMqKGwiUw" type="5001">
       <children xmi:type="notation:Node" xmi:id="_bKMSALIREeGyraMqKGwiUw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//Check/access"/>
+        <element xmi:type="ecore:EAttribute" href="security.ecore#//Permission/access"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_bKMSAbIREeGyraMqKGwiUw"/>
       </children>
       <styles xmi:type="notation:DrawerStyle" xmi:id="_PWMKYbIPEeGyraMqKGwiUw"/>
@@ -205,7 +149,7 @@
       <styles xmi:type="notation:FilteringStyle" xmi:id="_PWN_k7IPEeGyraMqKGwiUw"/>
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_PWGq0bIPEeGyraMqKGwiUw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="security.ecore#//Check"/>
+    <element xmi:type="ecore:EClass" href="security.ecore#//Permission"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PWGq0rIPEeGyraMqKGwiUw" x="718" y="245" width="183"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_tvbkQLIQEeGyraMqKGwiUw" type="1001">
@@ -221,44 +165,8 @@
       <styles xmi:type="notation:FilteringStyle" xmi:id="_tveAg7IQEeGyraMqKGwiUw"/>
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_tvbkQbIQEeGyraMqKGwiUw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="security.ecore#//ClassCheck"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tvbkQrIQEeGyraMqKGwiUw" x="756" y="373" width="108"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_u_PmULIQEeGyraMqKGwiUw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_u_Q0cLIQEeGyraMqKGwiUw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_u_Q0cbIQEeGyraMqKGwiUw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_u_Q0crIQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_u_Q0c7IQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_u_Q0dLIQEeGyraMqKGwiUw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_u_RbgLIQEeGyraMqKGwiUw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_u_RbgbIQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_u_RbgrIQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_u_Rbg7IQEeGyraMqKGwiUw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_u_PmUbIQEeGyraMqKGwiUw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="security.ecore#//PackageCheck"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u_PmUrIQEeGyraMqKGwiUw" x="590" y="373" width="128"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xW1v0LIQEeGyraMqKGwiUw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_xW298LIQEeGyraMqKGwiUw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xW298bIQEeGyraMqKGwiUw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_8_ib0LIREeGyraMqKGwiUw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="security.ecore#//ResourceCheck/pattern"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8_ib0bIREeGyraMqKGwiUw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xW298rIQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xW2987IQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xW3lALIQEeGyraMqKGwiUw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xW4zILIQEeGyraMqKGwiUw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xW4zIbIQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xW4zIrIQEeGyraMqKGwiUw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xW4zI7IQEeGyraMqKGwiUw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xW1v0bIQEeGyraMqKGwiUw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="security.ecore#//ResourceCheck"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xW1v0rIQEeGyraMqKGwiUw" x="900" y="373" width="134"/>
+    <element xmi:type="ecore:EClass" href="security.ecore#//ClassPermission"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tvbkQrIQEeGyraMqKGwiUw" x="746" y="373" width="127"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_Fl308LIREeGyraMqKGwiUw" type="1005">
     <children xmi:type="notation:Node" xmi:id="_Fl64QLIREeGyraMqKGwiUw" type="4010"/>
@@ -277,7 +185,7 @@
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_Fl4cALIREeGyraMqKGwiUw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
     <element xmi:type="ecore:EEnum" href="security.ecore#//Access"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fl4cAbIREeGyraMqKGwiUw" x="635" y="132" width="132"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fl4cAbIREeGyraMqKGwiUw" x="744" y="136" width="132"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_x3ZpwLIREeGyraMqKGwiUw" type="1001">
     <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x4HbcLIREeGyraMqKGwiUw" source="Shortcut">
@@ -322,7 +230,71 @@
     <children xmi:type="notation:Node" xmi:id="_UsXOkLRkEeG4L6jPmHyTfg" type="4009"/>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_UsS9IbRkEeG4L6jPmHyTfg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
     <element xmi:type="ecore:EDataType" href="security.ecore#//AccessObject"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsS9IrRkEeG4L6jPmHyTfg" x="830" y="130"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsS9IrRkEeG4L6jPmHyTfg" x="641" y="18" width="337"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="__E7kYbRpEeGKL-Elp-YnkA" type="1001">
+    <children xmi:type="notation:Node" xmi:id="__E9ZkLRpEeGKL-Elp-YnkA" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="__E9ZkbRpEeGKL-Elp-YnkA" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="__E9ZkrRpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="__E9Zk7RpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="__E9ZlLRpEeGKL-Elp-YnkA"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="__E-AoLRpEeGKL-Elp-YnkA" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="__E-AobRpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="__E-AorRpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="__E-Ao7RpEeGKL-Elp-YnkA"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="__E7kYrRpEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="security.ecore#//PackagePermission"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__E7kY7RpEeGKL-Elp-YnkA" x="592" y="346"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="__fc9MLRpEeGKL-Elp-YnkA" type="1001">
+    <children xmi:type="notation:Node" xmi:id="__fc9M7RpEeGKL-Elp-YnkA" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="__fdkQLRpEeGKL-Elp-YnkA" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="__fdkQbRpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="__fdkQrRpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="__fdkQ7RpEeGKL-Elp-YnkA"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="__fdkRLRpEeGKL-Elp-YnkA" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="__fdkRbRpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="__fdkRrRpEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="__fdkR7RpEeGKL-Elp-YnkA"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="__fc9MbRpEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="security.ecore#//ResourcePermission"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__fc9MrRpEeGKL-Elp-YnkA" x="950" y="377"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Knir8LRqEeGKL-Elp-YnkA" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_KnkhILRqEeGKL-Elp-YnkA" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_KnlIMLRqEeGKL-Elp-YnkA" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_KnlIMbRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KnlIMrRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KnlIM7RqEeGKL-Elp-YnkA"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_KnlvQLRqEeGKL-Elp-YnkA" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_KnlvQbRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KnlvQrRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KnlvQ7RqEeGKL-Elp-YnkA"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Knir8bRqEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="security.ecore#//Realm"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Knir8rRqEeGKL-Elp-YnkA" x="478" y="125"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_RslcALRqEeGKL-Elp-YnkA" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_RsnRMLRqEeGKL-Elp-YnkA" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Rsn4QLRqEeGKL-Elp-YnkA" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Rsn4QbRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Rsn4QrRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rsn4Q7RqEeGKL-Elp-YnkA"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_RsofULRqEeGKL-Elp-YnkA" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_RsofUbRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_RsofUrRqEeGKL-Elp-YnkA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RsofU7RqEeGKL-Elp-YnkA"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_RslcAbRqEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="security.ecore#//User"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RslcArRqEeGKL-Elp-YnkA" x="30" y="370"/>
   </children>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_BlsqIawpEeGqBf0LMO47dg"/>
   <element xmi:type="ecore:EPackage" href="security.ecore#/"/>
@@ -334,28 +306,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm4V4awpEeGqBf0LMO47dg" id="(0.5,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm4V4qwpEeGqBf0LMO47dg" id="(0.24647887323943662,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Bl4QVKwpEeGqBf0LMO47dg" type="3002" source="_BlyJuawpEeGqBf0LMO47dg" target="_BlxioqwpEeGqBf0LMO47dg">
-    <children xmi:type="notation:Node" xmi:id="_Bl4QWKwpEeGqBf0LMO47dg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl4QWawpEeGqBf0LMO47dg" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Bl4QWqwpEeGqBf0LMO47dg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl4QW6wpEeGqBf0LMO47dg" x="-5" y="12"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bl4QVawpEeGqBf0LMO47dg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Bl4QVqwpEeGqBf0LMO47dg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="security.ecore#//Realm/items"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bl4QV6wpEeGqBf0LMO47dg" points="[86, 28, -181, -17]$[184, 28, -83, -17]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm7ZMKwpEeGqBf0LMO47dg" id="(0.24347826086956523,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm7ZMawpEeGqBf0LMO47dg" id="(0.8333333333333334,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Bl43YKwpEeGqBf0LMO47dg" type="3003" source="_BlyJuawpEeGqBf0LMO47dg" target="_BlvtcKwpEeGqBf0LMO47dg">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bl43YawpEeGqBf0LMO47dg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Bl43YqwpEeGqBf0LMO47dg" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bl43Y6wpEeGqBf0LMO47dg" points="[-15, 0, 144, 63]$[-15, -34, 144, 29]$[-160, -34, -1, 29]$[-160, -63, -1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm8AQqwpEeGqBf0LMO47dg" id="(0.4956521739130435,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm8AQ6wpEeGqBf0LMO47dg" id="(0.5,1.0)"/>
-  </edges>
   <edges xmi:type="notation:Edge" xmi:id="_Bl43ZKwpEeGqBf0LMO47dg" type="3002" source="_BlywyqwpEeGqBf0LMO47dg" target="_BlxioqwpEeGqBf0LMO47dg">
     <children xmi:type="notation:Node" xmi:id="_Bl5ecKwpEeGqBf0LMO47dg" type="4011">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl5ecawpEeGqBf0LMO47dg" x="31" y="-12"/>
@@ -450,20 +400,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TSGacKwpEeGqBf0LMO47dg" id="(0.5,0.5)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TSGacawpEeGqBf0LMO47dg" id="(0.5,0.5)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Bl8hzKwpEeGqBf0LMO47dg" type="3002" source="_Bl1NAqwpEeGqBf0LMO47dg" target="_Bl2bIKwpEeGqBf0LMO47dg">
-    <children xmi:type="notation:Node" xmi:id="_Bl9I0KwpEeGqBf0LMO47dg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl9I0awpEeGqBf0LMO47dg" x="-3" y="-13"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Bl9I0qwpEeGqBf0LMO47dg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl9I06wpEeGqBf0LMO47dg" x="3" y="17"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bl8hzawpEeGqBf0LMO47dg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Bl8hzqwpEeGqBf0LMO47dg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="security.ecore#//Group/users"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bl8hz6wpEeGqBf0LMO47dg" points="[-50, -17, 226, 24]$[-147, -17, 129, 24]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDnHMrRkEeG4L6jPmHyTfg" id="(0.5,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDnHM7RkEeG4L6jPmHyTfg" id="(0.5,0.0)"/>
-  </edges>
   <edges xmi:type="notation:Edge" xmi:id="_Bl9I1KwpEeGqBf0LMO47dg" type="3003" source="_Bl1NAqwpEeGqBf0LMO47dg" target="_Bl0l8KwpEeGqBf0LMO47dg">
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bl9I1awpEeGqBf0LMO47dg" routing="Rectilinear" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="_Bl9I1qwpEeGqBf0LMO47dg" fontName="Segoe UI"/>
@@ -472,52 +408,16 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm9OYKwpEeGqBf0LMO47dg" id="(0.5,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm9OYawpEeGqBf0LMO47dg" id="(0.5196078431372549,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Bl9I2KwpEeGqBf0LMO47dg" type="3002" source="_Bl2bIKwpEeGqBf0LMO47dg" target="_Bl1NAqwpEeGqBf0LMO47dg">
-    <children xmi:type="notation:Node" xmi:id="_Bl9v4KwpEeGqBf0LMO47dg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl9v4awpEeGqBf0LMO47dg" x="-10" y="-11"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Bl9v4qwpEeGqBf0LMO47dg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl9v46wpEeGqBf0LMO47dg" x="3" y="13"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bl9I2awpEeGqBf0LMO47dg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Bl9I2qwpEeGqBf0LMO47dg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="security.ecore#//User/groups"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bl9I26wpEeGqBf0LMO47dg" points="[129, 24, -147, -17]$[226, 24, -50, -17]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDnuQLRkEeG4L6jPmHyTfg" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDnuQbRkEeG4L6jPmHyTfg" id="(0.5,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Bl-W9KwpEeGqBf0LMO47dg" type="3002" source="_Bl2bIKwpEeGqBf0LMO47dg" target="_Bl3pQKwpEeGqBf0LMO47dg">
-    <children xmi:type="notation:Node" xmi:id="_Bl-W-KwpEeGqBf0LMO47dg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl-W-awpEeGqBf0LMO47dg" x="-8" y="-33"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Bl-W-qwpEeGqBf0LMO47dg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl-W-6wpEeGqBf0LMO47dg" x="-8" y="13"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bl-W9awpEeGqBf0LMO47dg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Bl-W9qwpEeGqBf0LMO47dg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="security.ecore#//User/password"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bl-W96wpEeGqBf0LMO47dg" points="[86, 151, 0, -95]$[86, 197, 0, -49]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm6LEawpEeGqBf0LMO47dg" id="(0.16428571428571428,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm6LEqwpEeGqBf0LMO47dg" id="(0.49645390070921985,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Bl-W_KwpEeGqBf0LMO47dg" type="3003" source="_Bl2bIKwpEeGqBf0LMO47dg" target="_Bl0l8KwpEeGqBf0LMO47dg">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bl-W_awpEeGqBf0LMO47dg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Bl-W_qwpEeGqBf0LMO47dg" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bl-W_6wpEeGqBf0LMO47dg" points="[-45, 0, -138, 79]$[-45, -38, -138, 41]$[77, -38, -16, 41]$[77, -79, -16, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm9OYqwpEeGqBf0LMO47dg" id="(0.75,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bm9OY6wpEeGqBf0LMO47dg" id="(0.7549019607843137,1.0)"/>
-  </edges>
   <edges xmi:type="notation:Edge" xmi:id="_pKXTELIPEeGyraMqKGwiUw" type="3002" source="_BlzX26wpEeGqBf0LMO47dg" target="_PWGq0LIPEeGyraMqKGwiUw">
     <children xmi:type="notation:Node" xmi:id="_pKaWYLIPEeGyraMqKGwiUw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_pKaWYbIPEeGyraMqKGwiUw" x="-3" y="-12"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_pKaWYbIPEeGyraMqKGwiUw" x="-19" y="-12"/>
     </children>
     <children xmi:type="notation:Node" xmi:id="_pKbkgLIPEeGyraMqKGwiUw" type="4012">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_pKbkgbIPEeGyraMqKGwiUw" x="10" y="10"/>
     </children>
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_pKXTEbIPEeGyraMqKGwiUw" routing="Rectilinear" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="_pKXTErIPEeGyraMqKGwiUw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="security.ecore#//Role/checks"/>
+    <element xmi:type="ecore:EReference" href="security.ecore#//Role/permissions"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pKXTE7IPEeGyraMqKGwiUw" points="[90, 20, -244, 6]$[244, 20, -90, 6]"/>
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDo8YbRkEeG4L6jPmHyTfg" id="(0.10784313725490197,0.21568627450980393)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDo8YrRkEeG4L6jPmHyTfg" id="(0.5,0.5)"/>
@@ -531,7 +431,7 @@
     </children>
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_s4d8gbIPEeGyraMqKGwiUw" routing="Rectilinear" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="_s4ejkLIPEeGyraMqKGwiUw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="security.ecore#//Check/role"/>
+    <element xmi:type="ecore:EReference" href="security.ecore#//Permission/role"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s4ejkbIPEeGyraMqKGwiUw" points="[-90, 6, 244, 20]$[-244, 6, 90, 20]"/>
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDoVVLRkEeG4L6jPmHyTfg" id="(0.5,0.5)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KDo8YLRkEeG4L6jPmHyTfg" id="(0.10784313725490197,0.21568627450980393)"/>
@@ -542,16 +442,92 @@
     <element xsi:nil="true"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9vQeA7IQEeGyraMqKGwiUw" points="[-1, -20, 0, 104]$[-1, -99, 0, 25]"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="__I5KcLIQEeGyraMqKGwiUw" type="3003" source="_u_PmULIQEeGyraMqKGwiUw" target="_PWGq0LIPEeGyraMqKGwiUw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="__I5KcbIQEeGyraMqKGwiUw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="__I5KcrIQEeGyraMqKGwiUw" fontName="Segoe UI"/>
+  <edges xmi:type="notation:Edge" xmi:id="__FJm0LRpEeGKL-Elp-YnkA" type="3002" source="__E7kYbRpEeGKL-Elp-YnkA" target="_2OPHILIREeGyraMqKGwiUw">
+    <children xmi:type="notation:Node" xmi:id="__FKN4LRpEeGKL-Elp-YnkA" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="__FKN4bRpEeGKL-Elp-YnkA" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="__FKN4rRpEeGKL-Elp-YnkA" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="__FKN47RpEeGKL-Elp-YnkA" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="__FJm0bRpEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="__FJm0rRpEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="security.ecore#//PackagePermission/applicablePackage"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__FJm07RpEeGKL-Elp-YnkA" points="[1, 1, -653, -494]$[628, 476, -26, -19]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="__FLcALRpEeGKL-Elp-YnkA" type="3003" source="__E7kYbRpEeGKL-Elp-YnkA" target="_PWGq0LIPEeGyraMqKGwiUw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="__FLcAbRpEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="__FLcArRpEeGKL-Elp-YnkA" fontName="Segoe UI"/>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__I5Kc7IQEeGyraMqKGwiUw" points="[-1, -20, -156, 104]$[-1, -58, -156, 66]$[155, -58, 0, 66]$[155, -99, 0, 25]"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__FLcA7RpEeGKL-Elp-YnkA" points="[1, 0, -808, -270]$[736, 246, -73, -24]"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="__v8jYLIQEeGyraMqKGwiUw" type="3003" source="_xW1v0LIQEeGyraMqKGwiUw" target="_PWGq0LIPEeGyraMqKGwiUw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="__v8jYbIQEeGyraMqKGwiUw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="__v8jYrIQEeGyraMqKGwiUw" fontName="Segoe UI"/>
+  <edges xmi:type="notation:Edge" xmi:id="__fnVQLRpEeGKL-Elp-YnkA" type="3003" source="__fc9MLRpEeGKL-Elp-YnkA" target="_PWGq0LIPEeGyraMqKGwiUw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="__fnVQbRpEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="__fnVQrRpEeGKL-Elp-YnkA" fontName="Segoe UI"/>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__v8jY7IQEeGyraMqKGwiUw" points="[-1, -24, 157, 104]$[-1, -62, 157, 66]$[-158, -62, 0, 66]$[-158, -103, 0, 25]"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__fnVQ7RpEeGKL-Elp-YnkA" points="[1, 0, -808, -270]$[736, 246, -73, -24]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Kn1m4LRqEeGKL-Elp-YnkA" type="3002" source="_Knir8LRqEeGKL-Elp-YnkA" target="_BlxioqwpEeGqBf0LMO47dg">
+    <children xmi:type="notation:Node" xmi:id="_Kn2N8LRqEeGKL-Elp-YnkA" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Kn2N8bRqEeGKL-Elp-YnkA" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Kn2N8rRqEeGKL-Elp-YnkA" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Kn2N87RqEeGKL-Elp-YnkA" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Kn1m4bRqEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Kn1m4rRqEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="security.ecore#//Realm/items"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kn1m47RqEeGKL-Elp-YnkA" points="[1, 0, -286, -157]$[249, 137, -38, -20]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Kn7GcLRqEeGKL-Elp-YnkA" type="3003" source="_Knir8LRqEeGKL-Elp-YnkA" target="_BlvtcKwpEeGqBf0LMO47dg">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Kn7GcbRqEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Kn7GcrRqEeGKL-Elp-YnkA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kn7Gc7RqEeGKL-Elp-YnkA" points="[1, 0, -400, -45]$[331, 37, -70, -8]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Rs_rsLRqEeGKL-Elp-YnkA" type="3002" source="_RslcALRqEeGKL-Elp-YnkA" target="_Bl1NAqwpEeGqBf0LMO47dg">
+    <children xmi:type="notation:Node" xmi:id="_RtASwLRqEeGKL-Elp-YnkA" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RtASwbRqEeGKL-Elp-YnkA" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_RtASwrRqEeGKL-Elp-YnkA" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RtASw7RqEeGKL-Elp-YnkA" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Rs_rsbRqEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Rs_rsrRqEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="security.ecore#//User/groups"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Rs_rs7RqEeGKL-Elp-YnkA" points="[124, -52, -152, 0]$[226, -52, -50, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDcL8LRqEeGKL-Elp-YnkA" id="(0.5,0.5)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XDczALRqEeGKL-Elp-YnkA" id="(0.5,0.5)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_RtA50LRqEeGKL-Elp-YnkA" type="3002" source="_RslcALRqEeGKL-Elp-YnkA" target="_Bl3pQKwpEeGqBf0LMO47dg">
+    <children xmi:type="notation:Node" xmi:id="_RtA51LRqEeGKL-Elp-YnkA" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RtA51bRqEeGKL-Elp-YnkA" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_RtA51rRqEeGKL-Elp-YnkA" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RtA517RqEeGKL-Elp-YnkA" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_RtA50bRqEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_RtA50rRqEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="security.ecore#//User/password"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RtA507RqEeGKL-Elp-YnkA" points="[0, 1, -154, -594]$[148, 571, -6, -24]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_RtFyULRqEeGKL-Elp-YnkA" type="3003" source="_RslcALRqEeGKL-Elp-YnkA" target="_Bl0l8KwpEeGqBf0LMO47dg">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_RtFyUbRqEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_RtFyUrRqEeGKL-Elp-YnkA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RtFyU7RqEeGKL-Elp-YnkA" points="[1, 1, -286, -269]$[261, 246, -26, -24]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_RtHngLRqEeGKL-Elp-YnkA" type="3002" source="_Bl1NAqwpEeGqBf0LMO47dg" target="_RslcALRqEeGKL-Elp-YnkA">
+    <children xmi:type="notation:Node" xmi:id="_RtHnhLRqEeGKL-Elp-YnkA" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RtHnhbRqEeGKL-Elp-YnkA" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_RtHnhrRqEeGKL-Elp-YnkA" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RtHnh7RqEeGKL-Elp-YnkA" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_RtHngbRqEeGKL-Elp-YnkA" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_RtHngrRqEeGKL-Elp-YnkA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="security.ecore#//Group/users"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RtHng7RqEeGKL-Elp-YnkA" points="[-50, 0, 226, -52]$[-152, 0, 124, -52]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RtQxcLRqEeGKL-Elp-YnkA" id="(0.5,0.5)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RtQxcbRqEeGKL-Elp-YnkA" id="(0.5,0.5)"/>
   </edges>
 </notation:Diagram>
diff --git a/plugins/org.eclipse.emf.cdo.security/model/security.genmodel b/plugins/org.eclipse.emf.cdo.security/model/security.genmodel
index a426c4dbc1..9d5d02fe73 100644
--- a/plugins/org.eclipse.emf.cdo.security/model/security.genmodel
+++ b/plugins/org.eclipse.emf.cdo.security/model/security.genmodel
@@ -12,22 +12,23 @@
   <genPackages prefix="Security" basePackage="org.eclipse.emf.cdo" disposableProviderFactory="true"
       multipleEditorPages="false" extensibleProviderFactory="true" childCreationExtenders="true"
       ecorePackage="security.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="security.ecore#//Permission">
-      <genEnumLiterals ecoreEnumLiteral="security.ecore#//Permission/READ"/>
-      <genEnumLiterals ecoreEnumLiteral="security.ecore#//Permission/WRITE"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="security.ecore#//Access">
+      <genEnumLiterals ecoreEnumLiteral="security.ecore#//Access/READ"/>
+      <genEnumLiterals ecoreEnumLiteral="security.ecore#//Access/WRITE"/>
     </genEnums>
+    <genDataTypes ecoreDataType="security.ecore#//AccessObject"/>
     <genClasses image="false" ecoreClass="security.ecore#//SecurityElement">
       <genOperations ecoreOperation="security.ecore#//SecurityElement/getRealm"/>
     </genClasses>
     <genClasses image="false" ecoreClass="security.ecore#//SecurityItem"/>
-    <genClasses ecoreClass="security.ecore#//Realm">
+    <genClasses ecoreClass="security.ecore#//Realm" labelFeature="#//security/Realm/name">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference security.ecore#//Realm/items"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Realm/allUsers"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Realm/allGroups"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Realm/allRoles"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Realm/allChecks"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Realm/allPermissions"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//Realm/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//Realm/defaultPermission"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//Realm/defaultAccess"/>
     </genClasses>
     <genClasses ecoreClass="security.ecore#//Directory">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference security.ecore#//Directory/items"/>
@@ -35,7 +36,7 @@
     </genClasses>
     <genClasses ecoreClass="security.ecore#//Role">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//Role/id"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference security.ecore#//Role/checks"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference security.ecore#//Role/permissions"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference security.ecore#//Role/assignees"/>
     </genClasses>
     <genClasses image="false" ecoreClass="security.ecore#//Assignee">
@@ -51,35 +52,35 @@
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Group/allRoles"/>
     </genClasses>
     <genClasses ecoreClass="security.ecore#//User">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference security.ecore#//User/groups"/>
       <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/label"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/firstName"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/lastName"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/email"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/defaultPermissionOverride"/>
-      <genFeatures property="None" createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/defaultPermission"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/defaultAccessOverride"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/defaultAccess"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//User/locked"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference security.ecore#//User/password"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference security.ecore#//User/groups"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//User/allGroups"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//User/allRoles"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//User/allChecks"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//User/allPermissions"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//User/unassignedRoles"/>
     </genClasses>
     <genClasses ecoreClass="security.ecore#//UserPassword">
       <genFeatures property="None" createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//UserPassword/encrypted"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="security.ecore#//Check">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Check/role"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//Check/permission"/>
+    <genClasses image="false" ecoreClass="security.ecore#//Permission">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference security.ecore#//Permission/role"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//Permission/access"/>
     </genClasses>
-    <genClasses ecoreClass="security.ecore#//ClassCheck">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference security.ecore#//ClassCheck/applicableClass"/>
+    <genClasses ecoreClass="security.ecore#//ClassPermission">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference security.ecore#//ClassPermission/applicableClass"/>
     </genClasses>
-    <genClasses ecoreClass="security.ecore#//PackageCheck">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference security.ecore#//PackageCheck/applicablePackage"/>
+    <genClasses ecoreClass="security.ecore#//PackagePermission">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference security.ecore#//PackagePermission/applicablePackage"/>
     </genClasses>
-    <genClasses ecoreClass="security.ecore#//ResourceCheck">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//ResourceCheck/pattern"/>
+    <genClasses ecoreClass="security.ecore#//ResourcePermission">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute security.ecore#//ResourcePermission/pattern"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Access.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Access.java
index 1e67d29ffd..7dedb8d03a 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Access.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Access.java
@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Permission</b></em>',
+ * A representation of the literals of the enumeration '<em><b>Access</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * @see org.eclipse.emf.cdo.security.SecurityPackage#getAccess()
@@ -225,4 +225,4 @@ public enum Access implements Enumerator
     return literal;
   }
 
-} // Permission
+} // Access
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ClassCheck.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ClassPermission.java
index 446fa470e1..7936679c1f 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ClassCheck.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ClassPermission.java
@@ -14,21 +14,21 @@ import org.eclipse.emf.ecore.EClass;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Class Check</b></em>'.
+ * A representation of the model object '<em><b>Class Permissionermission</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.ClassCheck#getApplicableClass <em>Applicable Class</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.ClassPermission#getApplicableClass <em>Applicable Class</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.security.SecurityPackage#getClassCheck()
+ * @see org.eclipse.emf.cdo.security.SecurityPackage#getClassPermission()
  * @model
  * @generated
  */
-public interface ClassCheck extends Check
+public interface ClassPermission extends Permission
 {
   /**
    * Returns the value of the '<em><b>Applicable Class</b></em>' reference.
@@ -40,14 +40,14 @@ public interface ClassCheck extends Check
    * <!-- end-user-doc -->
    * @return the value of the '<em>Applicable Class</em>' reference.
    * @see #setApplicableClass(EClass)
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getClassCheck_ApplicableClass()
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getClassPermission_ApplicableClass()
    * @model required="true"
    * @generated
    */
   EClass getApplicableClass();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.security.ClassCheck#getApplicableClass <em>Applicable Class</em>}' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.security.ClassPermission#getApplicableClass <em>Applicable Class</em>}' reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @param value the new value of the '<em>Applicable Class</em>' reference.
@@ -56,4 +56,4 @@ public interface ClassCheck extends Check
    */
   void setApplicableClass(EClass value);
 
-} // ClassCheck
+} // ClassPermission
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PackageCheck.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PackagePermission.java
index 70fab3e9fc..eb12221af8 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PackageCheck.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PackagePermission.java
@@ -14,21 +14,21 @@ import org.eclipse.emf.ecore.EPackage;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Package Check</b></em>'.
+ * A representation of the model object '<em><b>Package Permission</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.PackageCheck#getApplicablePackage <em>Applicable Package</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.PackagePermission#getApplicablePackage <em>Applicable Package</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.security.SecurityPackage#getPackageCheck()
+ * @see org.eclipse.emf.cdo.security.SecurityPackage#getPackagePermission()
  * @model
  * @generated
  */
-public interface PackageCheck extends Check
+public interface PackagePermission extends Permission
 {
   /**
    * Returns the value of the '<em><b>Applicable Package</b></em>' reference.
@@ -40,14 +40,14 @@ public interface PackageCheck extends Check
    * <!-- end-user-doc -->
    * @return the value of the '<em>Applicable Package</em>' reference.
    * @see #setApplicablePackage(EPackage)
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getPackageCheck_ApplicablePackage()
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getPackagePermission_ApplicablePackage()
    * @model required="true"
    * @generated
    */
   EPackage getApplicablePackage();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.security.PackageCheck#getApplicablePackage <em>Applicable Package</em>}' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.security.PackagePermission#getApplicablePackage <em>Applicable Package</em>}' reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @param value the new value of the '<em>Applicable Package</em>' reference.
@@ -56,4 +56,4 @@ public interface PackageCheck extends Check
    */
   void setApplicablePackage(EPackage value);
 
-} // PackageCheck
+} // PackagePermission
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Check.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Permission.java
index cc6777b5b8..73b0817a9c 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Check.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Permission.java
@@ -17,27 +17,27 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionProvider;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Check</b></em>'.
+ * A representation of the model object '<em><b>Permission</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.Check#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.Check#getAccess <em>Access</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.Permission#getRole <em>Role</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.Permission#getAccess <em>Access</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.security.SecurityPackage#getCheck()
+ * @see org.eclipse.emf.cdo.security.SecurityPackage#getPermission()
  * @model abstract="true"
  * @extends CDOObject
  * @generated
  */
-public interface Check extends CDOObject
+public interface Permission extends CDOObject
 {
   /**
    * Returns the value of the '<em><b>Role</b></em>' container reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.security.Role#getChecks <em>Checks</em>}'.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.security.Role#getPermissions <em>Permissions</em>}'.
    * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Role</em>' container reference isn't clear,
@@ -46,15 +46,15 @@ public interface Check extends CDOObject
    * <!-- end-user-doc -->
    * @return the value of the '<em>Role</em>' container reference.
    * @see #setRole(Role)
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getCheck_Role()
-   * @see org.eclipse.emf.cdo.security.Role#getChecks
-   * @model opposite="checks" required="true" transient="false"
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getPermission_Role()
+   * @see org.eclipse.emf.cdo.security.Role#getPermissions
+   * @model opposite="permissions" required="true" transient="false"
    * @generated
    */
   Role getRole();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.security.Check#getRole <em>Role</em>}' container reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.security.Permission#getRole <em>Role</em>}' container reference.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @param value the new value of the '<em>Role</em>' container reference.
@@ -76,14 +76,14 @@ public interface Check extends CDOObject
    * @return the value of the '<em>Access</em>' attribute.
    * @see org.eclipse.emf.cdo.security.Access
    * @see #setAccess(Access)
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getCheck_Access()
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getPermission_Access()
    * @model default="WRITE" required="true"
    * @generated
    */
   Access getAccess();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.security.Check#getAccess <em>Access</em>}' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.security.Permission#getAccess <em>Access</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @param value the new value of the '<em>Access</em>' attribute.
@@ -95,4 +95,4 @@ public interface Check extends CDOObject
 
   boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext);
 
-} // Check
+} // Permission
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Realm.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Realm.java
index 13806d5568..944ed878e6 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Realm.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Realm.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.emf.cdo.security.Realm#getAllUsers <em>All Users</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.Realm#getAllGroups <em>All Groups</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.Realm#getAllRoles <em>All Roles</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.Realm#getAllChecks <em>All Checks</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.Realm#getAllPermissions <em>All Permissions</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.Realm#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.Realm#getDefaultAccess <em>Default Access</em>}</li>
  * </ul>
@@ -101,20 +101,20 @@ public interface Realm extends SecurityElement
   EList<Role> getAllRoles();
 
   /**
-   * Returns the value of the '<em><b>All Checks</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.security.Check}.
+   * Returns the value of the '<em><b>All Permissions</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.security.Permission}.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>All Checks</em>' reference list isn't clear,
+   * If the meaning of the '<em>All Permissions</em>' reference list isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>All Checks</em>' reference list.
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getRealm_AllChecks()
+   * @return the value of the '<em>All Permissions</em>' reference list.
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getRealm_AllPermissions()
    * @model transient="true" changeable="false" volatile="true" derived="true"
    * @generated
    */
-  EList<Check> getAllChecks();
+  EList<Permission> getAllPermissions();
 
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/RealmUtil.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/RealmUtil.java
index 593dc4aece..5acea1e63e 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/RealmUtil.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/RealmUtil.java
@@ -125,10 +125,10 @@ public final class RealmUtil
     return result;
   }
 
-  public static BasicEList<Check> allChecks(EList<SecurityItem> items)
+  public static BasicEList<Permission> allPermissions(EList<SecurityItem> items)
   {
-    BasicEList<Check> result = new BasicEList<Check>();
-    allChecks(items, result);
+    BasicEList<Permission> result = new BasicEList<Permission>();
+    allPermissions(items, result);
     return result;
   }
 
@@ -183,19 +183,19 @@ public final class RealmUtil
     }
   }
 
-  private static void allChecks(EList<SecurityItem> items, EList<Check> result)
+  private static void allPermissions(EList<SecurityItem> items, EList<Permission> result)
   {
     for (SecurityItem item : items)
     {
       if (item instanceof Role)
       {
         Role role = (Role)item;
-        result.addAll(role.getChecks());
+        result.addAll(role.getPermissions());
       }
       else if (item instanceof Directory)
       {
         Directory directory = (Directory)item;
-        allChecks(directory.getItems(), result);
+        allPermissions(directory.getItems(), result);
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ResourceCheck.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ResourcePermission.java
index 29679ab82f..2b31a5d9c2 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ResourceCheck.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/ResourcePermission.java
@@ -12,21 +12,21 @@ package org.eclipse.emf.cdo.security;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Resource Check</b></em>'.
+ * A representation of the model object '<em><b>Resource Permission</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.ResourceCheck#getPattern <em>Pattern</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.ResourcePermission#getPattern <em>Pattern</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.security.SecurityPackage#getResourceCheck()
+ * @see org.eclipse.emf.cdo.security.SecurityPackage#getResourcePermission()
  * @model
  * @generated
  */
-public interface ResourceCheck extends Check
+public interface ResourcePermission extends Permission
 {
   /**
    * Returns the value of the '<em><b>Pattern</b></em>' attribute.
@@ -38,14 +38,14 @@ public interface ResourceCheck extends Check
    * <!-- end-user-doc -->
    * @return the value of the '<em>Pattern</em>' attribute.
    * @see #setPattern(String)
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getResourceCheck_Pattern()
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getResourcePermission_Pattern()
    * @model
    * @generated
    */
   String getPattern();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.security.ResourceCheck#getPattern <em>Pattern</em>}' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.security.ResourcePermission#getPattern <em>Pattern</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @param value the new value of the '<em>Pattern</em>' attribute.
@@ -54,4 +54,4 @@ public interface ResourceCheck extends Check
    */
   void setPattern(String value);
 
-} // ResourceCheck
+} // ResourcePermission
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.java
index 16f273fbe8..80ac1a4edd 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/Role.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.emf.cdo.security.Role#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.Role#getChecks <em>Checks</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.Role#getPermissions <em>Permissions</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.Role#getAssignees <em>Assignees</em>}</li>
  * </ul>
  * </p>
@@ -77,21 +77,21 @@ public interface Role extends SecurityItem
   void setId(String value);
 
   /**
-   * Returns the value of the '<em><b>Checks</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.security.Check}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.security.Check#getRole <em>Role</em>}'.
+   * Returns the value of the '<em><b>Permissions</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.security.Permission}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.security.Permission#getRole <em>Role</em>}'.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Checks</em>' containment reference list isn't clear,
+   * If the meaning of the '<em>Permissions</em>' containment reference list isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Checks</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getRole_Checks()
-   * @see org.eclipse.emf.cdo.security.Check#getRole
+   * @return the value of the '<em>Permissions</em>' containment reference list.
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getRole_Permissions()
+   * @see org.eclipse.emf.cdo.security.Permission#getRole
    * @model opposite="role" containment="true"
    * @generated
    */
-  EList<Check> getChecks();
+  EList<Permission> getPermissions();
 
 } // Role
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityFactory.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityFactory.java
index fbc1a0519b..7f7670cc58 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityFactory.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityFactory.java
@@ -85,31 +85,31 @@ public interface SecurityFactory extends EFactory
   UserPassword createUserPassword();
 
   /**
-   * Returns a new object of class '<em>Class Check</em>'.
+   * Returns a new object of class '<em>Class Permission</em>'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return a new object of class '<em>Class Check</em>'.
+   * @return a new object of class '<em>Class Permission</em>'.
    * @generated
    */
-  ClassCheck createClassCheck();
+  ClassPermission createClassPermission();
 
   /**
-   * Returns a new object of class '<em>Package Check</em>'.
+   * Returns a new object of class '<em>Package Permission</em>'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return a new object of class '<em>Package Check</em>'.
+   * @return a new object of class '<em>Package Permission</em>'.
    * @generated
    */
-  PackageCheck createPackageCheck();
+  PackagePermission createPackagePermission();
 
   /**
-   * Returns a new object of class '<em>Resource Check</em>'.
+   * Returns a new object of class '<em>Resource Permission</em>'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return a new object of class '<em>Resource Check</em>'.
+   * @return a new object of class '<em>Resource Permission</em>'.
    * @generated
    */
-  ResourceCheck createResourceCheck();
+  ResourcePermission createResourcePermission();
 
   /**
    * Returns the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java
index b31fcf885c..25ec4e59ab 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java
@@ -190,13 +190,13 @@ public interface SecurityPackage extends EPackage
   int REALM__ALL_ROLES = SECURITY_ELEMENT_FEATURE_COUNT + 3;
 
   /**
-   * The feature id for the '<em><b>All Checks</b></em>' reference list.
+   * The feature id for the '<em><b>All Permissions</b></em>' reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int REALM__ALL_CHECKS = SECURITY_ELEMENT_FEATURE_COUNT + 4;
+  int REALM__ALL_PERMISSIONS = SECURITY_ELEMENT_FEATURE_COUNT + 4;
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -290,13 +290,13 @@ public interface SecurityPackage extends EPackage
   int ROLE__ID = SECURITY_ITEM_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Checks</b></em>' containment reference list.
+   * The feature id for the '<em><b>Permissions</b></em>' containment reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int ROLE__CHECKS = SECURITY_ITEM_FEATURE_COUNT + 1;
+  int ROLE__PERMISSIONS = SECURITY_ITEM_FEATURE_COUNT + 1;
 
   /**
    * The feature id for the '<em><b>Assignees</b></em>' reference list.
@@ -599,13 +599,13 @@ public interface SecurityPackage extends EPackage
   int USER__ALL_ROLES = ASSIGNEE_FEATURE_COUNT + 10;
 
   /**
-   * The feature id for the '<em><b>All Checks</b></em>' reference list.
+   * The feature id for the '<em><b>All Permissions</b></em>' reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int USER__ALL_CHECKS = ASSIGNEE_FEATURE_COUNT + 11;
+  int USER__ALL_PERMISSIONS = ASSIGNEE_FEATURE_COUNT + 11;
 
   /**
    * The feature id for the '<em><b>Unassigned Roles</b></em>' reference list.
@@ -654,14 +654,14 @@ public interface SecurityPackage extends EPackage
   int USER_PASSWORD_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.CheckImpl <em>Check</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.PermissionImpl <em>Permission</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.security.impl.CheckImpl
-   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getCheck()
+   * @see org.eclipse.emf.cdo.security.impl.PermissionImpl
+   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getPermission()
    * @generated
    */
-  int CHECK = 9;
+  int PERMISSION = 9;
 
   /**
    * The feature id for the '<em><b>Role</b></em>' container reference.
@@ -670,7 +670,7 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int CHECK__ROLE = 0;
+  int PERMISSION__ROLE = 0;
 
   /**
    * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -679,26 +679,26 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int CHECK__ACCESS = 1;
+  int PERMISSION__ACCESS = 1;
 
   /**
-   * The number of structural features of the '<em>Check</em>' class.
+   * The number of structural features of the '<em>Permission</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CHECK_FEATURE_COUNT = 2;
+  int PERMISSION_FEATURE_COUNT = 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.ClassCheckImpl <em>Class Check</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.ClassPermissionImpl <em>Class Permission</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.security.impl.ClassCheckImpl
-   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getClassCheck()
+   * @see org.eclipse.emf.cdo.security.impl.ClassPermissionImpl
+   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getClassPermission()
    * @generated
    */
-  int CLASS_CHECK = 10;
+  int CLASS_PERMISSION = 10;
 
   /**
    * The feature id for the '<em><b>Role</b></em>' container reference.
@@ -707,7 +707,7 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int CLASS_CHECK__ROLE = CHECK__ROLE;
+  int CLASS_PERMISSION__ROLE = PERMISSION__ROLE;
 
   /**
    * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -716,7 +716,7 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int CLASS_CHECK__ACCESS = CHECK__ACCESS;
+  int CLASS_PERMISSION__ACCESS = PERMISSION__ACCESS;
 
   /**
    * The feature id for the '<em><b>Applicable Class</b></em>' reference.
@@ -725,26 +725,26 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int CLASS_CHECK__APPLICABLE_CLASS = CHECK_FEATURE_COUNT + 0;
+  int CLASS_PERMISSION__APPLICABLE_CLASS = PERMISSION_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Class Check</em>' class.
+   * The number of structural features of the '<em>Class Permission</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int CLASS_CHECK_FEATURE_COUNT = CHECK_FEATURE_COUNT + 1;
+  int CLASS_PERMISSION_FEATURE_COUNT = PERMISSION_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.PackageCheckImpl <em>Package Check</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.PackagePermissionImpl <em>Package Permission</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.security.impl.PackageCheckImpl
-   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getPackageCheck()
+   * @see org.eclipse.emf.cdo.security.impl.PackagePermissionImpl
+   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getPackagePermission()
    * @generated
    */
-  int PACKAGE_CHECK = 11;
+  int PACKAGE_PERMISSION = 11;
 
   /**
    * The feature id for the '<em><b>Role</b></em>' container reference.
@@ -753,7 +753,7 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int PACKAGE_CHECK__ROLE = CHECK__ROLE;
+  int PACKAGE_PERMISSION__ROLE = PERMISSION__ROLE;
 
   /**
    * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -762,7 +762,7 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int PACKAGE_CHECK__ACCESS = CHECK__ACCESS;
+  int PACKAGE_PERMISSION__ACCESS = PERMISSION__ACCESS;
 
   /**
    * The feature id for the '<em><b>Applicable Package</b></em>' reference.
@@ -771,26 +771,26 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int PACKAGE_CHECK__APPLICABLE_PACKAGE = CHECK_FEATURE_COUNT + 0;
+  int PACKAGE_PERMISSION__APPLICABLE_PACKAGE = PERMISSION_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Package Check</em>' class.
+   * The number of structural features of the '<em>Package Permission</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int PACKAGE_CHECK_FEATURE_COUNT = CHECK_FEATURE_COUNT + 1;
+  int PACKAGE_PERMISSION_FEATURE_COUNT = PERMISSION_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.ResourceCheckImpl <em>Resource Check</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.security.impl.ResourcePermissionImpl <em>Resource Permission</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.security.impl.ResourceCheckImpl
-   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getResourceCheck()
+   * @see org.eclipse.emf.cdo.security.impl.ResourcePermissionImpl
+   * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getResourcePermission()
    * @generated
    */
-  int RESOURCE_CHECK = 12;
+  int RESOURCE_PERMISSION = 12;
 
   /**
    * The feature id for the '<em><b>Role</b></em>' container reference.
@@ -799,7 +799,7 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int RESOURCE_CHECK__ROLE = CHECK__ROLE;
+  int RESOURCE_PERMISSION__ROLE = PERMISSION__ROLE;
 
   /**
    * The feature id for the '<em><b>Access</b></em>' attribute.
@@ -808,7 +808,7 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int RESOURCE_CHECK__ACCESS = CHECK__ACCESS;
+  int RESOURCE_PERMISSION__ACCESS = PERMISSION__ACCESS;
 
   /**
    * The feature id for the '<em><b>Pattern</b></em>' attribute.
@@ -817,16 +817,16 @@ public interface SecurityPackage extends EPackage
    * @generated
    * @ordered
    */
-  int RESOURCE_CHECK__PATTERN = CHECK_FEATURE_COUNT + 0;
+  int RESOURCE_PERMISSION__PATTERN = PERMISSION_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Resource Check</em>' class.
+   * The number of structural features of the '<em>Resource Permission</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int RESOURCE_CHECK_FEATURE_COUNT = CHECK_FEATURE_COUNT + 1;
+  int RESOURCE_PERMISSION_FEATURE_COUNT = PERMISSION_FEATURE_COUNT + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.security.Access <em>Access</em>}' enum.
@@ -913,15 +913,15 @@ public interface SecurityPackage extends EPackage
   EReference getRealm_AllRoles();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.security.Realm#getAllChecks <em>All Checks</em>}'.
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.security.Realm#getAllPermissions <em>All Permissions</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>All Checks</em>'.
-   * @see org.eclipse.emf.cdo.security.Realm#getAllChecks()
+   * @return the meta object for the reference list '<em>All Permissions</em>'.
+   * @see org.eclipse.emf.cdo.security.Realm#getAllPermissions()
    * @see #getRealm()
    * @generated
    */
-  EReference getRealm_AllChecks();
+  EReference getRealm_AllPermissions();
 
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.security.Realm#getName <em>Name</em>}'.
@@ -1020,15 +1020,15 @@ public interface SecurityPackage extends EPackage
   EAttribute getRole_Id();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.security.Role#getChecks <em>Checks</em>}'.
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.security.Role#getPermissions <em>Permissions</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Checks</em>'.
-   * @see org.eclipse.emf.cdo.security.Role#getChecks()
+   * @return the meta object for the containment reference list '<em>Permissions</em>'.
+   * @see org.eclipse.emf.cdo.security.Role#getPermissions()
    * @see #getRole()
    * @generated
    */
-  EReference getRole_Checks();
+  EReference getRole_Permissions();
 
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.Assignee <em>Assignee</em>}'.
@@ -1182,15 +1182,15 @@ public interface SecurityPackage extends EPackage
   EReference getUser_AllRoles();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.security.User#getAllChecks <em>All Checks</em>}'.
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.security.User#getAllPermissions <em>All Permissions</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>All Checks</em>'.
-   * @see org.eclipse.emf.cdo.security.User#getAllChecks()
+   * @return the meta object for the reference list '<em>All Permissions</em>'.
+   * @see org.eclipse.emf.cdo.security.User#getAllPermissions()
    * @see #getUser()
    * @generated
    */
-  EReference getUser_AllChecks();
+  EReference getUser_AllPermissions();
 
   /**
    * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.security.User#getUnassignedRoles <em>Unassigned Roles</em>}'.
@@ -1313,99 +1313,99 @@ public interface SecurityPackage extends EPackage
   EAttribute getUserPassword_Encrypted();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.Check <em>Check</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.Permission <em>Permission</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Check</em>'.
-   * @see org.eclipse.emf.cdo.security.Check
+   * @return the meta object for class '<em>Permission</em>'.
+   * @see org.eclipse.emf.cdo.security.Permission
    * @generated
    */
-  EClass getCheck();
+  EClass getPermission();
 
   /**
-   * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.security.Check#getRole <em>Role</em>}'.
+   * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.security.Permission#getRole <em>Role</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @return the meta object for the container reference '<em>Role</em>'.
-   * @see org.eclipse.emf.cdo.security.Check#getRole()
-   * @see #getCheck()
+   * @see org.eclipse.emf.cdo.security.Permission#getRole()
+   * @see #getPermission()
    * @generated
    */
-  EReference getCheck_Role();
+  EReference getPermission_Role();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.security.Check#getAccess <em>Access</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.security.Permission#getAccess <em>Access</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Access</em>'.
-   * @see org.eclipse.emf.cdo.security.Check#getAccess()
-   * @see #getCheck()
+   * @see org.eclipse.emf.cdo.security.Permission#getAccess()
+   * @see #getPermission()
    * @generated
    */
-  EAttribute getCheck_Access();
+  EAttribute getPermission_Access();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.ClassCheck <em>Class Check</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.ClassPermission <em>Class Permission</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Class Check</em>'.
-   * @see org.eclipse.emf.cdo.security.ClassCheck
+   * @return the meta object for class '<em>Class Permission</em>'.
+   * @see org.eclipse.emf.cdo.security.ClassPermission
    * @generated
    */
-  EClass getClassCheck();
+  EClass getClassPermission();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.security.ClassCheck#getApplicableClass <em>Applicable Class</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.security.ClassPermission#getApplicableClass <em>Applicable Class</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Applicable Class</em>'.
-   * @see org.eclipse.emf.cdo.security.ClassCheck#getApplicableClass()
-   * @see #getClassCheck()
+   * @see org.eclipse.emf.cdo.security.ClassPermission#getApplicableClass()
+   * @see #getClassPermission()
    * @generated
    */
-  EReference getClassCheck_ApplicableClass();
+  EReference getClassPermission_ApplicableClass();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.PackageCheck <em>Package Check</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.PackagePermission <em>Package Permission</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Package Check</em>'.
-   * @see org.eclipse.emf.cdo.security.PackageCheck
+   * @return the meta object for class '<em>Package Permission</em>'.
+   * @see org.eclipse.emf.cdo.security.PackagePermission
    * @generated
    */
-  EClass getPackageCheck();
+  EClass getPackagePermission();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.security.PackageCheck#getApplicablePackage <em>Applicable Package</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.security.PackagePermission#getApplicablePackage <em>Applicable Package</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Applicable Package</em>'.
-   * @see org.eclipse.emf.cdo.security.PackageCheck#getApplicablePackage()
-   * @see #getPackageCheck()
+   * @see org.eclipse.emf.cdo.security.PackagePermission#getApplicablePackage()
+   * @see #getPackagePermission()
    * @generated
    */
-  EReference getPackageCheck_ApplicablePackage();
+  EReference getPackagePermission_ApplicablePackage();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.ResourceCheck <em>Resource Check</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.security.ResourcePermission <em>Resource Permission</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Resource Check</em>'.
-   * @see org.eclipse.emf.cdo.security.ResourceCheck
+   * @return the meta object for class '<em>Resource Permission</em>'.
+   * @see org.eclipse.emf.cdo.security.ResourcePermission
    * @generated
    */
-  EClass getResourceCheck();
+  EClass getResourcePermission();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.security.ResourceCheck#getPattern <em>Pattern</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.security.ResourcePermission#getPattern <em>Pattern</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Pattern</em>'.
-   * @see org.eclipse.emf.cdo.security.ResourceCheck#getPattern()
-   * @see #getResourceCheck()
+   * @see org.eclipse.emf.cdo.security.ResourcePermission#getPattern()
+   * @see #getResourcePermission()
    * @generated
    */
-  EAttribute getResourceCheck_Pattern();
+  EAttribute getResourcePermission_Pattern();
 
   /**
    * Returns the meta object for enum '{@link org.eclipse.emf.cdo.security.Access <em>Access</em>}'.
@@ -1505,12 +1505,12 @@ public interface SecurityPackage extends EPackage
     EReference REALM__ALL_ROLES = eINSTANCE.getRealm_AllRoles();
 
     /**
-     * The meta object literal for the '<em><b>All Checks</b></em>' reference list feature.
+     * The meta object literal for the '<em><b>All Permissions</b></em>' reference list feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference REALM__ALL_CHECKS = eINSTANCE.getRealm_AllChecks();
+    EReference REALM__ALL_PERMISSIONS = eINSTANCE.getRealm_AllPermissions();
 
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -1591,12 +1591,12 @@ public interface SecurityPackage extends EPackage
     EAttribute ROLE__ID = eINSTANCE.getRole_Id();
 
     /**
-     * The meta object literal for the '<em><b>Checks</b></em>' containment reference list feature.
+     * The meta object literal for the '<em><b>Permissions</b></em>' containment reference list feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference ROLE__CHECKS = eINSTANCE.getRole_Checks();
+    EReference ROLE__PERMISSIONS = eINSTANCE.getRole_Permissions();
 
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.AssigneeImpl <em>Assignee</em>}' class.
@@ -1717,12 +1717,12 @@ public interface SecurityPackage extends EPackage
     EReference USER__ALL_ROLES = eINSTANCE.getUser_AllRoles();
 
     /**
-     * The meta object literal for the '<em><b>All Checks</b></em>' reference list feature.
+     * The meta object literal for the '<em><b>All Permissions</b></em>' reference list feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference USER__ALL_CHECKS = eINSTANCE.getUser_AllChecks();
+    EReference USER__ALL_PERMISSIONS = eINSTANCE.getUser_AllPermissions();
 
     /**
      * The meta object literal for the '<em><b>Unassigned Roles</b></em>' reference list feature.
@@ -1815,14 +1815,14 @@ public interface SecurityPackage extends EPackage
     EAttribute USER_PASSWORD__ENCRYPTED = eINSTANCE.getUserPassword_Encrypted();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.CheckImpl <em>Check</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.PermissionImpl <em>Permission</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.security.impl.CheckImpl
-     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getCheck()
+     * @see org.eclipse.emf.cdo.security.impl.PermissionImpl
+     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getPermission()
      * @generated
      */
-    EClass CHECK = eINSTANCE.getCheck();
+    EClass PERMISSION = eINSTANCE.getPermission();
 
     /**
      * The meta object literal for the '<em><b>Role</b></em>' container reference feature.
@@ -1830,7 +1830,7 @@ public interface SecurityPackage extends EPackage
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference CHECK__ROLE = eINSTANCE.getCheck_Role();
+    EReference PERMISSION__ROLE = eINSTANCE.getPermission_Role();
 
     /**
      * The meta object literal for the '<em><b>Access</b></em>' attribute feature.
@@ -1838,17 +1838,17 @@ public interface SecurityPackage extends EPackage
      * <!-- end-user-doc -->
      * @generated
      */
-    EAttribute CHECK__ACCESS = eINSTANCE.getCheck_Access();
+    EAttribute PERMISSION__ACCESS = eINSTANCE.getPermission_Access();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.ClassCheckImpl <em>Class Check</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.ClassPermissionImpl <em>Class Permission</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.security.impl.ClassCheckImpl
-     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getClassCheck()
+     * @see org.eclipse.emf.cdo.security.impl.ClassPermissionImpl
+     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getClassPermission()
      * @generated
      */
-    EClass CLASS_CHECK = eINSTANCE.getClassCheck();
+    EClass CLASS_PERMISSION = eINSTANCE.getClassPermission();
 
     /**
      * The meta object literal for the '<em><b>Applicable Class</b></em>' reference feature.
@@ -1856,17 +1856,17 @@ public interface SecurityPackage extends EPackage
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference CLASS_CHECK__APPLICABLE_CLASS = eINSTANCE.getClassCheck_ApplicableClass();
+    EReference CLASS_PERMISSION__APPLICABLE_CLASS = eINSTANCE.getClassPermission_ApplicableClass();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.PackageCheckImpl <em>Package Check</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.PackagePermissionImpl <em>Package Permission</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.security.impl.PackageCheckImpl
-     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getPackageCheck()
+     * @see org.eclipse.emf.cdo.security.impl.PackagePermissionImpl
+     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getPackagePermission()
      * @generated
      */
-    EClass PACKAGE_CHECK = eINSTANCE.getPackageCheck();
+    EClass PACKAGE_PERMISSION = eINSTANCE.getPackagePermission();
 
     /**
      * The meta object literal for the '<em><b>Applicable Package</b></em>' reference feature.
@@ -1874,17 +1874,17 @@ public interface SecurityPackage extends EPackage
      * <!-- end-user-doc -->
      * @generated
      */
-    EReference PACKAGE_CHECK__APPLICABLE_PACKAGE = eINSTANCE.getPackageCheck_ApplicablePackage();
+    EReference PACKAGE_PERMISSION__APPLICABLE_PACKAGE = eINSTANCE.getPackagePermission_ApplicablePackage();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.ResourceCheckImpl <em>Resource Check</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.ResourcePermissionImpl <em>Resource Permission</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.security.impl.ResourceCheckImpl
-     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getResourceCheck()
+     * @see org.eclipse.emf.cdo.security.impl.ResourcePermissionImpl
+     * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getResourcePermission()
      * @generated
      */
-    EClass RESOURCE_CHECK = eINSTANCE.getResourceCheck();
+    EClass RESOURCE_PERMISSION = eINSTANCE.getResourcePermission();
 
     /**
      * The meta object literal for the '<em><b>Pattern</b></em>' attribute feature.
@@ -1892,7 +1892,7 @@ public interface SecurityPackage extends EPackage
      * <!-- end-user-doc -->
      * @generated
      */
-    EAttribute RESOURCE_CHECK__PATTERN = eINSTANCE.getResourceCheck_Pattern();
+    EAttribute RESOURCE_PERMISSION__PATTERN = eINSTANCE.getResourcePermission_Pattern();
 
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.security.Access <em>Access</em>}' enum.
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.java
index e682c7d773..86762b41f6 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/User.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.emf.cdo.security.User#getPassword <em>Password</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.User#getAllGroups <em>All Groups</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.User#getAllRoles <em>All Roles</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.User#getAllChecks <em>All Checks</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.User#getAllPermissions <em>All Permissions</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.User#getUnassignedRoles <em>Unassigned Roles</em>}</li>
  * </ul>
  * </p>
@@ -93,20 +93,20 @@ public interface User extends Assignee
   EList<Role> getAllRoles();
 
   /**
-   * Returns the value of the '<em><b>All Checks</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.security.Check}.
+   * Returns the value of the '<em><b>All Permissions</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.security.Permission}.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>All Checks</em>' reference list isn't clear,
+   * If the meaning of the '<em>All Permissions</em>' reference list isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>All Checks</em>' reference list.
-   * @see org.eclipse.emf.cdo.security.SecurityPackage#getUser_AllChecks()
+   * @return the value of the '<em>All Permissions</em>' reference list.
+   * @see org.eclipse.emf.cdo.security.SecurityPackage#getUser_AllPermissions()
    * @model transient="true" changeable="false" volatile="true" derived="true"
    * @generated
    */
-  EList<Check> getAllChecks();
+  EList<Permission> getAllPermissions();
 
   /**
    * Returns the value of the '<em><b>Unassigned Roles</b></em>' reference list.
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassCheckImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
index 1071017889..9e8fece2a3 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassCheckImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
@@ -13,32 +13,32 @@ package org.eclipse.emf.cdo.security.impl;
 import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionProvider;
-import org.eclipse.emf.cdo.security.ClassCheck;
+import org.eclipse.emf.cdo.security.ClassPermission;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Class Check</b></em>'.
+ * An implementation of the model object '<em><b>Class Permission</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.ClassCheckImpl#getApplicableClass <em>Applicable Class</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.ClassPermissionImpl#getApplicableClass <em>Applicable Class</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class ClassCheckImpl extends CheckImpl implements ClassCheck
+public class ClassPermissionImpl extends PermissionImpl implements ClassPermission
 {
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected ClassCheckImpl()
+  protected ClassPermissionImpl()
   {
     super();
   }
@@ -51,7 +51,7 @@ public class ClassCheckImpl extends CheckImpl implements ClassCheck
   @Override
   protected EClass eStaticClass()
   {
-    return SecurityPackage.Literals.CLASS_CHECK;
+    return SecurityPackage.Literals.CLASS_PERMISSION;
   }
 
   /**
@@ -61,7 +61,7 @@ public class ClassCheckImpl extends CheckImpl implements ClassCheck
    */
   public EClass getApplicableClass()
   {
-    return (EClass)eGet(SecurityPackage.Literals.CLASS_CHECK__APPLICABLE_CLASS, true);
+    return (EClass)eGet(SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, true);
   }
 
   /**
@@ -71,7 +71,7 @@ public class ClassCheckImpl extends CheckImpl implements ClassCheck
    */
   public void setApplicableClass(EClass newApplicableClass)
   {
-    eSet(SecurityPackage.Literals.CLASS_CHECK__APPLICABLE_CLASS, newApplicableClass);
+    eSet(SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, newApplicableClass);
   }
 
   public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
@@ -81,4 +81,4 @@ public class ClassCheckImpl extends CheckImpl implements ClassCheck
     return actualClass == applicableClass;
   }
 
-} // ClassCheckImpl
+} // ClassPermissionImpl
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackageCheckImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
index 75b6180a41..5144a2de10 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackageCheckImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.security.impl;
 import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionProvider;
-import org.eclipse.emf.cdo.security.PackageCheck;
+import org.eclipse.emf.cdo.security.PackagePermission;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
 import org.eclipse.emf.ecore.EClass;
@@ -21,25 +21,25 @@ import org.eclipse.emf.ecore.EPackage;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Package Check</b></em>'.
+ * An implementation of the model object '<em><b>Package Permission</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.PackageCheckImpl#getApplicablePackage <em>Applicable Package</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.PackagePermissionImpl#getApplicablePackage <em>Applicable Package</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class PackageCheckImpl extends CheckImpl implements PackageCheck
+public class PackagePermissionImpl extends PermissionImpl implements PackagePermission
 {
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected PackageCheckImpl()
+  protected PackagePermissionImpl()
   {
     super();
   }
@@ -52,7 +52,7 @@ public class PackageCheckImpl extends CheckImpl implements PackageCheck
   @Override
   protected EClass eStaticClass()
   {
-    return SecurityPackage.Literals.PACKAGE_CHECK;
+    return SecurityPackage.Literals.PACKAGE_PERMISSION;
   }
 
   /**
@@ -62,7 +62,7 @@ public class PackageCheckImpl extends CheckImpl implements PackageCheck
    */
   public EPackage getApplicablePackage()
   {
-    return (EPackage)eGet(SecurityPackage.Literals.PACKAGE_CHECK__APPLICABLE_PACKAGE, true);
+    return (EPackage)eGet(SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, true);
   }
 
   /**
@@ -72,7 +72,7 @@ public class PackageCheckImpl extends CheckImpl implements PackageCheck
    */
   public void setApplicablePackage(EPackage newApplicablePackage)
   {
-    eSet(SecurityPackage.Literals.PACKAGE_CHECK__APPLICABLE_PACKAGE, newApplicablePackage);
+    eSet(SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, newApplicablePackage);
   }
 
   public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
@@ -82,4 +82,4 @@ public class PackageCheckImpl extends CheckImpl implements PackageCheck
     return actualPackage == applicablePackage;
   }
 
-} // PackageCheckImpl
+} // PackagePermissionImpl
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/CheckImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PermissionImpl.java
index 8d36a23e09..9e4e3c5124 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/CheckImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PermissionImpl.java
@@ -10,7 +10,7 @@
  */
 package org.eclipse.emf.cdo.security.impl;
 
-import org.eclipse.emf.cdo.security.Check;
+import org.eclipse.emf.cdo.security.Permission;
 import org.eclipse.emf.cdo.security.Access;
 import org.eclipse.emf.cdo.security.Role;
 import org.eclipse.emf.cdo.security.SecurityPackage;
@@ -21,26 +21,26 @@ import org.eclipse.emf.ecore.EClass;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Check</b></em>'.
+ * An implementation of the model object '<em><b>Permission</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.CheckImpl#getRole <em>Role</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.CheckImpl#getAccess <em>Access</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.PermissionImpl#getRole <em>Role</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.PermissionImpl#getAccess <em>Access</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public abstract class CheckImpl extends CDOObjectImpl implements Check
+public abstract class PermissionImpl extends CDOObjectImpl implements Permission
 {
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected CheckImpl()
+  protected PermissionImpl()
   {
     super();
   }
@@ -53,7 +53,7 @@ public abstract class CheckImpl extends CDOObjectImpl implements Check
   @Override
   protected EClass eStaticClass()
   {
-    return SecurityPackage.Literals.CHECK;
+    return SecurityPackage.Literals.PERMISSION;
   }
 
   /**
@@ -74,7 +74,7 @@ public abstract class CheckImpl extends CDOObjectImpl implements Check
    */
   public Role getRole()
   {
-    return (Role)eGet(SecurityPackage.Literals.CHECK__ROLE, true);
+    return (Role)eGet(SecurityPackage.Literals.PERMISSION__ROLE, true);
   }
 
   /**
@@ -84,7 +84,7 @@ public abstract class CheckImpl extends CDOObjectImpl implements Check
    */
   public void setRole(Role newRole)
   {
-    eSet(SecurityPackage.Literals.CHECK__ROLE, newRole);
+    eSet(SecurityPackage.Literals.PERMISSION__ROLE, newRole);
   }
 
   /**
@@ -94,7 +94,7 @@ public abstract class CheckImpl extends CDOObjectImpl implements Check
    */
   public Access getAccess()
   {
-    return (Access)eGet(SecurityPackage.Literals.CHECK__ACCESS, true);
+    return (Access)eGet(SecurityPackage.Literals.PERMISSION__ACCESS, true);
   }
 
   /**
@@ -104,7 +104,7 @@ public abstract class CheckImpl extends CDOObjectImpl implements Check
    */
   public void setAccess(Access newAccess)
   {
-    eSet(SecurityPackage.Literals.CHECK__ACCESS, newAccess);
+    eSet(SecurityPackage.Literals.PERMISSION__ACCESS, newAccess);
   }
 
-} // CheckImpl
+} // PermissionImpl
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RealmImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RealmImpl.java
index fbb2867778..4cc483d451 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RealmImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RealmImpl.java
@@ -10,9 +10,9 @@
  */
 package org.eclipse.emf.cdo.security.impl;
 
-import org.eclipse.emf.cdo.security.Check;
-import org.eclipse.emf.cdo.security.Group;
 import org.eclipse.emf.cdo.security.Access;
+import org.eclipse.emf.cdo.security.Group;
+import org.eclipse.emf.cdo.security.Permission;
 import org.eclipse.emf.cdo.security.Realm;
 import org.eclipse.emf.cdo.security.RealmUtil;
 import org.eclipse.emf.cdo.security.Role;
@@ -36,7 +36,7 @@ import org.eclipse.emf.ecore.InternalEObject;
  *   <li>{@link org.eclipse.emf.cdo.security.impl.RealmImpl#getAllUsers <em>All Users</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.RealmImpl#getAllGroups <em>All Groups</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.RealmImpl#getAllRoles <em>All Roles</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.RealmImpl#getAllChecks <em>All Checks</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.RealmImpl#getAllPermissions <em>All Permissions</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.RealmImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.RealmImpl#getDefaultAccess <em>Default Access</em>}</li>
  * </ul>
@@ -112,7 +112,7 @@ public class RealmImpl extends SecurityElementImpl implements Realm
     }
   };
 
-  private EList<Check> allChecks = new CachedList<Check>()
+  private EList<Permission> allPermissions = new CachedList<Permission>()
   {
     @Override
     protected InternalEObject getOwner()
@@ -123,14 +123,14 @@ public class RealmImpl extends SecurityElementImpl implements Realm
     @Override
     protected EStructuralFeature getFeature()
     {
-      return SecurityPackage.Literals.REALM__ALL_CHECKS;
+      return SecurityPackage.Literals.REALM__ALL_PERMISSIONS;
     }
 
     @Override
     protected Object[] getData()
     {
       EList<SecurityItem> items = getItems();
-      return RealmUtil.allChecks(items).toArray();
+      return RealmUtil.allPermissions(items).toArray();
     }
   };
 
@@ -201,9 +201,9 @@ public class RealmImpl extends SecurityElementImpl implements Realm
    * <!-- end-user-doc -->
    * @generated NOT
    */
-  public EList<Check> getAllChecks()
+  public EList<Permission> getAllPermissions()
   {
-    return allChecks;
+    return allPermissions;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourceCheckImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
index 7bb2f3040c..037ad10bd2 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourceCheckImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionProvider;
 import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
-import org.eclipse.emf.cdo.security.ResourceCheck;
+import org.eclipse.emf.cdo.security.ResourcePermission;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
 import org.eclipse.emf.ecore.EClass;
@@ -26,18 +26,18 @@ import java.util.regex.PatternSyntaxException;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Resource Check</b></em>'.
+ * An implementation of the model object '<em><b>Resource Permission</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.ResourceCheckImpl#getPattern <em>Pattern</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.ResourcePermissionImpl#getPattern <em>Pattern</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class ResourceCheckImpl extends CheckImpl implements ResourceCheck
+public class ResourcePermissionImpl extends PermissionImpl implements ResourcePermission
 {
   private Pattern pattern;
 
@@ -46,7 +46,7 @@ public class ResourceCheckImpl extends CheckImpl implements ResourceCheck
    * <!-- end-user-doc -->
    * @generated
    */
-  protected ResourceCheckImpl()
+  protected ResourcePermissionImpl()
   {
     super();
   }
@@ -59,7 +59,7 @@ public class ResourceCheckImpl extends CheckImpl implements ResourceCheck
   @Override
   protected EClass eStaticClass()
   {
-    return SecurityPackage.Literals.RESOURCE_CHECK;
+    return SecurityPackage.Literals.RESOURCE_PERMISSION;
   }
 
   /**
@@ -69,7 +69,7 @@ public class ResourceCheckImpl extends CheckImpl implements ResourceCheck
    */
   public String getPattern()
   {
-    return (String)eGet(SecurityPackage.Literals.RESOURCE_CHECK__PATTERN, true);
+    return (String)eGet(SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, true);
   }
 
   /**
@@ -79,14 +79,14 @@ public class ResourceCheckImpl extends CheckImpl implements ResourceCheck
    */
   public void setPattern(String newPattern)
   {
-    eSet(SecurityPackage.Literals.RESOURCE_CHECK__PATTERN, newPattern);
+    eSet(SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, newPattern);
   }
 
   @Override
   public void eSet(EStructuralFeature eFeature, Object newValue)
   {
     super.eSet(eFeature, newValue);
-    if (eFeature == SecurityPackage.Literals.RESOURCE_CHECK__PATTERN)
+    if (eFeature == SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN)
     {
       String value = (String)newValue;
       pattern = compilePattern(value);
@@ -128,4 +128,4 @@ public class ResourceCheckImpl extends CheckImpl implements ResourceCheck
     return matcher.matches();
   }
 
-} // ResourceCheckImpl
+} // ResourcePermissionImpl
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RoleImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RoleImpl.java
index dd0c3fc565..0fd3a04aa5 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RoleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/RoleImpl.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.cdo.security.impl;
 
 import org.eclipse.emf.cdo.security.Assignee;
-import org.eclipse.emf.cdo.security.Check;
+import org.eclipse.emf.cdo.security.Permission;
 import org.eclipse.emf.cdo.security.Role;
 import org.eclipse.emf.cdo.security.SecurityPackage;
 
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EClass;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.RoleImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.RoleImpl#getChecks <em>Checks</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.RoleImpl#getPermissions <em>Permissions</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.RoleImpl#getAssignees <em>Assignees</em>}</li>
  * </ul>
  * </p>
@@ -93,9 +93,9 @@ public class RoleImpl extends SecurityItemImpl implements Role
    * @generated
    */
   @SuppressWarnings("unchecked")
-  public EList<Check> getChecks()
+  public EList<Permission> getPermissions()
   {
-    return (EList<Check>)eGet(SecurityPackage.Literals.ROLE__CHECKS, true);
+    return (EList<Permission>)eGet(SecurityPackage.Literals.ROLE__PERMISSIONS, true);
   }
 
 } // RoleImpl
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
index 1f66411f20..bbd8ce69c7 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityFactoryImpl.java
@@ -11,13 +11,13 @@
 package org.eclipse.emf.cdo.security.impl;
 
 //import org.eclipse.emf.cdo.security.*;
-import org.eclipse.emf.cdo.security.ClassCheck;
+import org.eclipse.emf.cdo.security.ClassPermission;
 import org.eclipse.emf.cdo.security.Directory;
 import org.eclipse.emf.cdo.security.Group;
-import org.eclipse.emf.cdo.security.PackageCheck;
+import org.eclipse.emf.cdo.security.PackagePermission;
 import org.eclipse.emf.cdo.security.Access;
 import org.eclipse.emf.cdo.security.Realm;
-import org.eclipse.emf.cdo.security.ResourceCheck;
+import org.eclipse.emf.cdo.security.ResourcePermission;
 import org.eclipse.emf.cdo.security.Role;
 import org.eclipse.emf.cdo.security.SecurityFactory;
 import org.eclipse.emf.cdo.security.SecurityPackage;
@@ -96,12 +96,12 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
       return (EObject)createUser();
     case SecurityPackage.USER_PASSWORD:
       return (EObject)createUserPassword();
-    case SecurityPackage.CLASS_CHECK:
-      return (EObject)createClassCheck();
-    case SecurityPackage.PACKAGE_CHECK:
-      return (EObject)createPackageCheck();
-    case SecurityPackage.RESOURCE_CHECK:
-      return (EObject)createResourceCheck();
+    case SecurityPackage.CLASS_PERMISSION:
+      return (EObject)createClassPermission();
+    case SecurityPackage.PACKAGE_PERMISSION:
+      return (EObject)createPackagePermission();
+    case SecurityPackage.RESOURCE_PERMISSION:
+      return (EObject)createResourcePermission();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
@@ -216,10 +216,10 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
    * <!-- end-user-doc -->
    * @generated
    */
-  public ClassCheck createClassCheck()
+  public ClassPermission createClassPermission()
   {
-    ClassCheckImpl classCheck = new ClassCheckImpl();
-    return classCheck;
+    ClassPermissionImpl classPermission = new ClassPermissionImpl();
+    return classPermission;
   }
 
   /**
@@ -227,10 +227,10 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
    * <!-- end-user-doc -->
    * @generated
    */
-  public PackageCheck createPackageCheck()
+  public PackagePermission createPackagePermission()
   {
-    PackageCheckImpl packageCheck = new PackageCheckImpl();
-    return packageCheck;
+    PackagePermissionImpl packagePermission = new PackagePermissionImpl();
+    return packagePermission;
   }
 
   /**
@@ -238,10 +238,10 @@ public class SecurityFactoryImpl extends EFactoryImpl implements SecurityFactory
    * <!-- end-user-doc -->
    * @generated
    */
-  public ResourceCheck createResourceCheck()
+  public ResourcePermission createResourcePermission()
   {
-    ResourceCheckImpl resourceCheck = new ResourceCheckImpl();
-    return resourceCheck;
+    ResourcePermissionImpl resourcePermission = new ResourcePermissionImpl();
+    return resourcePermission;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
index 1a3a503904..05069f4a69 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
@@ -12,14 +12,14 @@ package org.eclipse.emf.cdo.security.impl;
 
 import org.eclipse.emf.cdo.etypes.EtypesPackage;
 import org.eclipse.emf.cdo.security.Assignee;
-import org.eclipse.emf.cdo.security.Check;
-import org.eclipse.emf.cdo.security.ClassCheck;
+import org.eclipse.emf.cdo.security.Permission;
+import org.eclipse.emf.cdo.security.ClassPermission;
 import org.eclipse.emf.cdo.security.Directory;
 import org.eclipse.emf.cdo.security.Group;
-import org.eclipse.emf.cdo.security.PackageCheck;
+import org.eclipse.emf.cdo.security.PackagePermission;
 import org.eclipse.emf.cdo.security.Access;
 import org.eclipse.emf.cdo.security.Realm;
-import org.eclipse.emf.cdo.security.ResourceCheck;
+import org.eclipse.emf.cdo.security.ResourcePermission;
 import org.eclipse.emf.cdo.security.Role;
 import org.eclipse.emf.cdo.security.SecurityElement;
 import org.eclipse.emf.cdo.security.SecurityFactory;
@@ -113,28 +113,28 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  private EClass checkEClass = null;
+  private EClass permissionEClass = null;
 
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  private EClass classCheckEClass = null;
+  private EClass classPermissionEClass = null;
 
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  private EClass packageCheckEClass = null;
+  private EClass packagePermissionEClass = null;
 
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  private EClass resourceCheckEClass = null;
+  private EClass resourcePermissionEClass = null;
 
   /**
    * <!-- begin-user-doc -->
@@ -282,7 +282,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getRealm_AllChecks()
+  public EReference getRealm_AllPermissions()
   {
     return (EReference)realmEClass.getEStructuralFeatures().get(4);
   }
@@ -382,7 +382,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getRole_Checks()
+  public EReference getRole_Permissions()
   {
     return (EReference)roleEClass.getEStructuralFeatures().get(1);
   }
@@ -532,7 +532,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getUser_AllChecks()
+  public EReference getUser_AllPermissions()
   {
     return (EReference)userEClass.getEStructuralFeatures().get(11);
   }
@@ -652,9 +652,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EClass getCheck()
+  public EClass getPermission()
   {
-    return checkEClass;
+    return permissionEClass;
   }
 
   /**
@@ -662,9 +662,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getCheck_Role()
+  public EReference getPermission_Role()
   {
-    return (EReference)checkEClass.getEStructuralFeatures().get(0);
+    return (EReference)permissionEClass.getEStructuralFeatures().get(0);
   }
 
   /**
@@ -672,9 +672,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EAttribute getCheck_Access()
+  public EAttribute getPermission_Access()
   {
-    return (EAttribute)checkEClass.getEStructuralFeatures().get(1);
+    return (EAttribute)permissionEClass.getEStructuralFeatures().get(1);
   }
 
   /**
@@ -682,9 +682,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EClass getClassCheck()
+  public EClass getClassPermission()
   {
-    return classCheckEClass;
+    return classPermissionEClass;
   }
 
   /**
@@ -692,9 +692,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getClassCheck_ApplicableClass()
+  public EReference getClassPermission_ApplicableClass()
   {
-    return (EReference)classCheckEClass.getEStructuralFeatures().get(0);
+    return (EReference)classPermissionEClass.getEStructuralFeatures().get(0);
   }
 
   /**
@@ -702,9 +702,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EClass getPackageCheck()
+  public EClass getPackagePermission()
   {
-    return packageCheckEClass;
+    return packagePermissionEClass;
   }
 
   /**
@@ -712,9 +712,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EReference getPackageCheck_ApplicablePackage()
+  public EReference getPackagePermission_ApplicablePackage()
   {
-    return (EReference)packageCheckEClass.getEStructuralFeatures().get(0);
+    return (EReference)packagePermissionEClass.getEStructuralFeatures().get(0);
   }
 
   /**
@@ -722,9 +722,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EClass getResourceCheck()
+  public EClass getResourcePermission()
   {
-    return resourceCheckEClass;
+    return resourcePermissionEClass;
   }
 
   /**
@@ -732,9 +732,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EAttribute getResourceCheck_Pattern()
+  public EAttribute getResourcePermission_Pattern()
   {
-    return (EAttribute)resourceCheckEClass.getEStructuralFeatures().get(0);
+    return (EAttribute)resourcePermissionEClass.getEStructuralFeatures().get(0);
   }
 
   /**
@@ -797,7 +797,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     createEReference(realmEClass, REALM__ALL_USERS);
     createEReference(realmEClass, REALM__ALL_GROUPS);
     createEReference(realmEClass, REALM__ALL_ROLES);
-    createEReference(realmEClass, REALM__ALL_CHECKS);
+    createEReference(realmEClass, REALM__ALL_PERMISSIONS);
     createEAttribute(realmEClass, REALM__NAME);
     createEAttribute(realmEClass, REALM__DEFAULT_ACCESS);
 
@@ -807,7 +807,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
 
     roleEClass = createEClass(ROLE);
     createEAttribute(roleEClass, ROLE__ID);
-    createEReference(roleEClass, ROLE__CHECKS);
+    createEReference(roleEClass, ROLE__PERMISSIONS);
     createEReference(roleEClass, ROLE__ASSIGNEES);
 
     assigneeEClass = createEClass(ASSIGNEE);
@@ -834,24 +834,24 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     createEReference(userEClass, USER__PASSWORD);
     createEReference(userEClass, USER__ALL_GROUPS);
     createEReference(userEClass, USER__ALL_ROLES);
-    createEReference(userEClass, USER__ALL_CHECKS);
+    createEReference(userEClass, USER__ALL_PERMISSIONS);
     createEReference(userEClass, USER__UNASSIGNED_ROLES);
 
     userPasswordEClass = createEClass(USER_PASSWORD);
     createEAttribute(userPasswordEClass, USER_PASSWORD__ENCRYPTED);
 
-    checkEClass = createEClass(CHECK);
-    createEReference(checkEClass, CHECK__ROLE);
-    createEAttribute(checkEClass, CHECK__ACCESS);
+    permissionEClass = createEClass(PERMISSION);
+    createEReference(permissionEClass, PERMISSION__ROLE);
+    createEAttribute(permissionEClass, PERMISSION__ACCESS);
 
-    classCheckEClass = createEClass(CLASS_CHECK);
-    createEReference(classCheckEClass, CLASS_CHECK__APPLICABLE_CLASS);
+    classPermissionEClass = createEClass(CLASS_PERMISSION);
+    createEReference(classPermissionEClass, CLASS_PERMISSION__APPLICABLE_CLASS);
 
-    packageCheckEClass = createEClass(PACKAGE_CHECK);
-    createEReference(packageCheckEClass, PACKAGE_CHECK__APPLICABLE_PACKAGE);
+    packagePermissionEClass = createEClass(PACKAGE_PERMISSION);
+    createEReference(packagePermissionEClass, PACKAGE_PERMISSION__APPLICABLE_PACKAGE);
 
-    resourceCheckEClass = createEClass(RESOURCE_CHECK);
-    createEAttribute(resourceCheckEClass, RESOURCE_CHECK__PATTERN);
+    resourcePermissionEClass = createEClass(RESOURCE_PERMISSION);
+    createEAttribute(resourcePermissionEClass, RESOURCE_PERMISSION__PATTERN);
 
     // Create enums
     accessEEnum = createEEnum(ACCESS);
@@ -902,9 +902,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     assigneeEClass.getESuperTypes().add(this.getSecurityItem());
     groupEClass.getESuperTypes().add(this.getAssignee());
     userEClass.getESuperTypes().add(this.getAssignee());
-    classCheckEClass.getESuperTypes().add(this.getCheck());
-    packageCheckEClass.getESuperTypes().add(this.getCheck());
-    resourceCheckEClass.getESuperTypes().add(this.getCheck());
+    classPermissionEClass.getESuperTypes().add(this.getPermission());
+    packagePermissionEClass.getESuperTypes().add(this.getPermission());
+    resourcePermissionEClass.getESuperTypes().add(this.getPermission());
 
     // Initialize classes and features; add operations and parameters
     initEClass(securityElementEClass, SecurityElement.class,
@@ -937,10 +937,10 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
         null,
         "allRoles", null, 0, -1, Realm.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
-        getRealm_AllChecks(),
-        this.getCheck(),
+        getRealm_AllPermissions(),
+        this.getPermission(),
         null,
-        "allChecks", null, 0, -1, Realm.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        "allPermissions", null, 0, -1, Realm.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
         getRealm_Name(),
         theEcorePackage.getEString(),
@@ -967,10 +967,10 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
         theEcorePackage.getEString(),
         "id", null, 0, 1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
-        getRole_Checks(),
-        this.getCheck(),
-        this.getCheck_Role(),
-        "checks", null, 0, -1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        getRole_Permissions(),
+        this.getPermission(),
+        this.getPermission_Role(),
+        "permissions", null, 0, -1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
         getRole_Assignees(),
         this.getAssignee(),
@@ -1070,10 +1070,10 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
         null,
         "allRoles", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
-        getUser_AllChecks(),
-        this.getCheck(),
+        getUser_AllPermissions(),
+        this.getPermission(),
         null,
-        "allChecks", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        "allPermissions", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
         getUser_UnassignedRoles(),
         this.getRole(),
@@ -1087,39 +1087,40 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
         theEcorePackage.getEString(),
         "encrypted", null, 0, 1, UserPassword.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(checkEClass, Check.class, "Check", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEClass(permissionEClass, Permission.class,
+        "Permission", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
-        getCheck_Role(),
+        getPermission_Role(),
         this.getRole(),
-        this.getRole_Checks(),
-        "role", null, 1, 1, Check.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        this.getRole_Permissions(),
+        "role", null, 1, 1, Permission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
-        getCheck_Access(),
+        getPermission_Access(),
         this.getAccess(),
-        "access", "WRITE", 1, 1, Check.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        "access", "WRITE", 1, 1, Permission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 
-    initEClass(classCheckEClass, ClassCheck.class,
-        "ClassCheck", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEClass(classPermissionEClass, ClassPermission.class,
+        "ClassPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
-        getClassCheck_ApplicableClass(),
+        getClassPermission_ApplicableClass(),
         theEcorePackage.getEClass(),
         null,
-        "applicableClass", null, 1, 1, ClassCheck.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        "applicableClass", null, 1, 1, ClassPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(packageCheckEClass, PackageCheck.class,
-        "PackageCheck", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEClass(packagePermissionEClass, PackagePermission.class,
+        "PackagePermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
-        getPackageCheck_ApplicablePackage(),
+        getPackagePermission_ApplicablePackage(),
         theEcorePackage.getEPackage(),
         null,
-        "applicablePackage", null, 1, 1, PackageCheck.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        "applicablePackage", null, 1, 1, PackagePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(resourceCheckEClass, ResourceCheck.class,
-        "ResourceCheck", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEClass(resourcePermissionEClass, ResourcePermission.class,
+        "ResourcePermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
-        getResourceCheck_Pattern(),
+        getResourcePermission_Pattern(),
         theEcorePackage.getEString(),
-        "pattern", null, 0, 1, ResourceCheck.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+        "pattern", null, 0, 1, ResourcePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
     // Initialize enums and add enum literals
     initEEnum(accessEEnum, Access.class, "Access"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java
index b837aed59e..3c972059a7 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/UserImpl.java
@@ -11,8 +11,8 @@
 package org.eclipse.emf.cdo.security.impl;
 
 import org.eclipse.emf.cdo.security.Access;
-import org.eclipse.emf.cdo.security.Check;
 import org.eclipse.emf.cdo.security.Group;
+import org.eclipse.emf.cdo.security.Permission;
 import org.eclipse.emf.cdo.security.Realm;
 import org.eclipse.emf.cdo.security.Role;
 import org.eclipse.emf.cdo.security.SecurityPackage;
@@ -46,7 +46,7 @@ import java.util.Set;
  *   <li>{@link org.eclipse.emf.cdo.security.impl.UserImpl#getPassword <em>Password</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.UserImpl#getAllGroups <em>All Groups</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.UserImpl#getAllRoles <em>All Roles</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.security.impl.UserImpl#getAllChecks <em>All Checks</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.security.impl.UserImpl#getAllPermissions <em>All Permissions</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.security.impl.UserImpl#getUnassignedRoles <em>Unassigned Roles</em>}</li>
  * </ul>
  * </p>
@@ -113,7 +113,7 @@ public class UserImpl extends AssigneeImpl implements User
     }
   };
 
-  private EList<Check> allChecks = new CachedList<Check>()
+  private EList<Permission> allPermissions = new CachedList<Permission>()
   {
     @Override
     protected InternalEObject getOwner()
@@ -124,17 +124,17 @@ public class UserImpl extends AssigneeImpl implements User
     @Override
     protected EStructuralFeature getFeature()
     {
-      return SecurityPackage.Literals.USER__ALL_CHECKS;
+      return SecurityPackage.Literals.USER__ALL_PERMISSIONS;
     }
 
     @Override
     protected Object[] getData()
     {
-      BasicEList<Check> result = new BasicEList<Check>();
+      BasicEList<Permission> result = new BasicEList<Permission>();
 
       for (Role role : getAllRoles())
       {
-        result.addAll(role.getChecks());
+        result.addAll(role.getPermissions());
       }
 
       return result.toArray();
@@ -228,9 +228,9 @@ public class UserImpl extends AssigneeImpl implements User
    * <!-- end-user-doc -->
    * @generated NOT
    */
-  public EList<Check> getAllChecks()
+  public EList<Permission> getAllPermissions()
   {
-    return allChecks;
+    return allPermissions;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityAdapterFactory.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityAdapterFactory.java
index 8b950dad0a..616a8818d0 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityAdapterFactory.java
@@ -12,13 +12,13 @@ package org.eclipse.emf.cdo.security.util;
 
 import org.eclipse.emf.cdo.etypes.ModelElement;
 import org.eclipse.emf.cdo.security.Assignee;
-import org.eclipse.emf.cdo.security.Check;
-import org.eclipse.emf.cdo.security.ClassCheck;
+import org.eclipse.emf.cdo.security.Permission;
+import org.eclipse.emf.cdo.security.ClassPermission;
 import org.eclipse.emf.cdo.security.Directory;
 import org.eclipse.emf.cdo.security.Group;
-import org.eclipse.emf.cdo.security.PackageCheck;
+import org.eclipse.emf.cdo.security.PackagePermission;
 import org.eclipse.emf.cdo.security.Realm;
-import org.eclipse.emf.cdo.security.ResourceCheck;
+import org.eclipse.emf.cdo.security.ResourcePermission;
 import org.eclipse.emf.cdo.security.Role;
 import org.eclipse.emf.cdo.security.SecurityElement;
 import org.eclipse.emf.cdo.security.SecurityItem;
@@ -150,27 +150,27 @@ public class SecurityAdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
-    public Adapter caseCheck(Check object)
+    public Adapter casePermission(Permission object)
     {
-      return createCheckAdapter();
+      return createPermissionAdapter();
     }
 
     @Override
-    public Adapter caseClassCheck(ClassCheck object)
+    public Adapter caseClassPermission(ClassPermission object)
     {
-      return createClassCheckAdapter();
+      return createClassPermissionAdapter();
     }
 
     @Override
-    public Adapter casePackageCheck(PackageCheck object)
+    public Adapter casePackagePermission(PackagePermission object)
     {
-      return createPackageCheckAdapter();
+      return createPackagePermissionAdapter();
     }
 
     @Override
-    public Adapter caseResourceCheck(ResourceCheck object)
+    public Adapter caseResourcePermission(ResourcePermission object)
     {
-      return createResourceCheckAdapter();
+      return createResourcePermissionAdapter();
     }
 
     @Override
@@ -336,61 +336,61 @@ public class SecurityAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.Check <em>Check</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.Permission <em>Permission</em>}'.
    * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
    * @return the new adapter.
-   * @see org.eclipse.emf.cdo.security.Check
+   * @see org.eclipse.emf.cdo.security.Permission
    * @generated
    */
-  public Adapter createCheckAdapter()
+  public Adapter createPermissionAdapter()
   {
     return null;
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.ClassCheck <em>Class Check</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.ClassPermission <em>Class Permission</em>}'.
    * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
    * @return the new adapter.
-   * @see org.eclipse.emf.cdo.security.ClassCheck
+   * @see org.eclipse.emf.cdo.security.ClassPermission
    * @generated
    */
-  public Adapter createClassCheckAdapter()
+  public Adapter createClassPermissionAdapter()
   {
     return null;
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.PackageCheck <em>Package Check</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.PackagePermission <em>Package Permission</em>}'.
    * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
    * @return the new adapter.
-   * @see org.eclipse.emf.cdo.security.PackageCheck
+   * @see org.eclipse.emf.cdo.security.PackagePermission
    * @generated
    */
-  public Adapter createPackageCheckAdapter()
+  public Adapter createPackagePermissionAdapter()
   {
     return null;
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.ResourceCheck <em>Resource Check</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.security.ResourcePermission <em>Resource Permission</em>}'.
    * <!-- begin-user-doc -->
    * This default implementation returns null so that we can easily ignore cases;
    * it's useful to ignore a case when inheritance will catch all the cases anyway.
    * <!-- end-user-doc -->
    * @return the new adapter.
-   * @see org.eclipse.emf.cdo.security.ResourceCheck
+   * @see org.eclipse.emf.cdo.security.ResourcePermission
    * @generated
    */
-  public Adapter createResourceCheckAdapter()
+  public Adapter createResourcePermissionAdapter()
   {
     return null;
   }
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
index 973dae5fc1..a71cbbd811 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
@@ -12,13 +12,13 @@ package org.eclipse.emf.cdo.security.util;
 
 import org.eclipse.emf.cdo.etypes.ModelElement;
 import org.eclipse.emf.cdo.security.Assignee;
-import org.eclipse.emf.cdo.security.Check;
-import org.eclipse.emf.cdo.security.ClassCheck;
+import org.eclipse.emf.cdo.security.Permission;
+import org.eclipse.emf.cdo.security.ClassPermission;
 import org.eclipse.emf.cdo.security.Directory;
 import org.eclipse.emf.cdo.security.Group;
-import org.eclipse.emf.cdo.security.PackageCheck;
+import org.eclipse.emf.cdo.security.PackagePermission;
 import org.eclipse.emf.cdo.security.Realm;
-import org.eclipse.emf.cdo.security.ResourceCheck;
+import org.eclipse.emf.cdo.security.ResourcePermission;
 import org.eclipse.emf.cdo.security.Role;
 import org.eclipse.emf.cdo.security.SecurityElement;
 import org.eclipse.emf.cdo.security.SecurityItem;
@@ -229,40 +229,40 @@ public class SecuritySwitch<T>
         result = defaultCase(theEObject);
       return result;
     }
-    case SecurityPackage.CHECK:
+    case SecurityPackage.PERMISSION:
     {
-      Check check = (Check)theEObject;
-      T result = caseCheck(check);
+      Permission permission = (Permission)theEObject;
+      T result = casePermission(permission);
       if (result == null)
         result = defaultCase(theEObject);
       return result;
     }
-    case SecurityPackage.CLASS_CHECK:
+    case SecurityPackage.CLASS_PERMISSION:
     {
-      ClassCheck classCheck = (ClassCheck)theEObject;
-      T result = caseClassCheck(classCheck);
+      ClassPermission classPermission = (ClassPermission)theEObject;
+      T result = caseClassPermission(classPermission);
       if (result == null)
-        result = caseCheck(classCheck);
+        result = casePermission(classPermission);
       if (result == null)
         result = defaultCase(theEObject);
       return result;
     }
-    case SecurityPackage.PACKAGE_CHECK:
+    case SecurityPackage.PACKAGE_PERMISSION:
     {
-      PackageCheck packageCheck = (PackageCheck)theEObject;
-      T result = casePackageCheck(packageCheck);
+      PackagePermission packagePermission = (PackagePermission)theEObject;
+      T result = casePackagePermission(packagePermission);
       if (result == null)
-        result = caseCheck(packageCheck);
+        result = casePermission(packagePermission);
       if (result == null)
         result = defaultCase(theEObject);
       return result;
     }
-    case SecurityPackage.RESOURCE_CHECK:
+    case SecurityPackage.RESOURCE_PERMISSION:
     {
-      ResourceCheck resourceCheck = (ResourceCheck)theEObject;
-      T result = caseResourceCheck(resourceCheck);
+      ResourcePermission resourcePermission = (ResourcePermission)theEObject;
+      T result = caseResourcePermission(resourcePermission);
       if (result == null)
-        result = caseCheck(resourceCheck);
+        result = casePermission(resourcePermission);
       if (result == null)
         result = defaultCase(theEObject);
       return result;
@@ -417,65 +417,65 @@ public class SecuritySwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Check</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Permission</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
    * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Check</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Permission</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
    */
-  public T caseCheck(Check object)
+  public T casePermission(Permission object)
   {
     return null;
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Class Check</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Class Permission</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
    * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Class Check</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Class Permission</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
    */
-  public T caseClassCheck(ClassCheck object)
+  public T caseClassPermission(ClassPermission object)
   {
     return null;
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Package Check</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Package Permission</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
    * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Package Check</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Package Permission</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
    */
-  public T casePackageCheck(PackageCheck object)
+  public T casePackagePermission(PackagePermission object)
   {
     return null;
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Resource Check</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Resource Permission</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;
    * returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
    * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Resource Check</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Resource Permission</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
    */
-  public T caseResourceCheck(ResourceCheck object)
+  public T caseResourcePermission(ResourcePermission object)
   {
     return null;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
index 104f5b312e..1bae76e297 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
@@ -19,10 +19,10 @@ import org.eclipse.emf.cdo.net4j.CDONet4jSession;
 import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration;
 import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
 import org.eclipse.emf.cdo.security.Access;
-import org.eclipse.emf.cdo.security.Check;
-import org.eclipse.emf.cdo.security.ClassCheck;
+import org.eclipse.emf.cdo.security.ClassPermission;
 import org.eclipse.emf.cdo.security.Directory;
 import org.eclipse.emf.cdo.security.Group;
+import org.eclipse.emf.cdo.security.Permission;
 import org.eclipse.emf.cdo.security.Realm;
 import org.eclipse.emf.cdo.security.RealmUtil;
 import org.eclipse.emf.cdo.security.Role;
@@ -358,10 +358,10 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
           continue;
         }
 
-        ClassCheck check = SecurityFactory.eINSTANCE.createClassCheck();
-        check.setAccess(Access.WRITE);
-        administration.getChecks().add(check);
-        check.setApplicableClass(eClass);
+        ClassPermission permission = SecurityFactory.eINSTANCE.createClassPermission();
+        permission.setAccess(Access.WRITE);
+        administration.getPermissions().add(permission);
+        permission.setApplicableClass(eClass);
       }
     }
 
@@ -392,18 +392,18 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
       return result;
     }
 
-    for (Check check : user.getAllChecks())
+    for (Permission permission : user.getAllPermissions())
     {
-      CDOPermission permission = convertPermission(check.getAccess());
-      if (permission.ordinal() <= result.ordinal())
+      CDOPermission p = convertPermission(permission.getAccess());
+      if (p.ordinal() <= result.ordinal())
       {
-        // Avoid expensive calls to Check.isApplicable() if the permission wouldn't increase
+        // Avoid expensive calls to Permission.isApplicable() if the permission wouldn't increase
         continue;
       }
 
-      if (check.isApplicable(revision, revisionProvider, securityContext))
+      if (permission.isApplicable(revision, revisionProvider, securityContext))
       {
-        result = permission;
+        result = p;
         if (result == CDOPermission.WRITE)
         {
           return result;
@@ -531,12 +531,12 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
 
       handleCommit(commitContext, user);
 
-      checkRevisionsBeforeCommitting(commitContext, securityContext, user, commitContext.getNewObjects());
-      checkRevisionsBeforeCommitting(commitContext, securityContext, user, commitContext.getDirtyObjects());
+      permissionRevisionsBeforeCommitting(commitContext, securityContext, user, commitContext.getNewObjects());
+      permissionRevisionsBeforeCommitting(commitContext, securityContext, user, commitContext.getDirtyObjects());
     }
 
-    private void checkRevisionsBeforeCommitting(CommitContext commitContext, CDOBranchPoint securityContext, User user,
-        InternalCDORevision[] revisions)
+    private void permissionRevisionsBeforeCommitting(CommitContext commitContext, CDOBranchPoint securityContext,
+        User user, InternalCDORevision[] revisions)
     {
       for (InternalCDORevision revision : revisions)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java
index 74c0d9db79..7939692a61 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/AnnotationHandler.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageInfo;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
 import org.eclipse.emf.cdo.security.Access;
-import org.eclipse.emf.cdo.security.Check;
+import org.eclipse.emf.cdo.security.Permission;
 import org.eclipse.emf.cdo.security.Realm;
 import org.eclipse.emf.cdo.security.RealmUtil;
 import org.eclipse.emf.cdo.security.Role;
@@ -105,20 +105,20 @@ public class AnnotationHandler implements InternalSecurityManager.CommitHandler
 
   protected void handlePackagePermission(Realm realm, EPackage ePackage, String key, Access access)
   {
-    EClass checkClass = SecurityPackage.Literals.PACKAGE_CHECK;
-    EReference checkFeature = SecurityPackage.Literals.PACKAGE_CHECK__APPLICABLE_PACKAGE;
-    handlePermission(realm, ePackage, key, access, checkClass, checkFeature);
+    EClass permissionClass = SecurityPackage.Literals.PACKAGE_PERMISSION;
+    EReference permissionFeature = SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE;
+    handlePermission(realm, ePackage, key, access, permissionClass, permissionFeature);
   }
 
   protected void handleClassPermission(Realm realm, EClass eClass, String key, Access access)
   {
-    EClass checkClass = SecurityPackage.Literals.CLASS_CHECK;
-    EReference checkFeature = SecurityPackage.Literals.CLASS_CHECK__APPLICABLE_CLASS;
-    handlePermission(realm, eClass, key, access, checkClass, checkFeature);
+    EClass permissionClass = SecurityPackage.Literals.CLASS_PERMISSION;
+    EReference permissionFeature = SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS;
+    handlePermission(realm, eClass, key, access, permissionClass, permissionFeature);
   }
 
   protected void handlePermission(Realm realm, EModelElement modelElement, String key, Access access,
-      EClass checkClass, EReference checkFeature)
+      EClass permissionClass, EReference permissionFeature)
   {
     String annotation = EcoreUtil.getAnnotation(modelElement, SOURCE_URI, key);
     if (annotation == null || annotation.length() == 0)
@@ -134,9 +134,9 @@ public class AnnotationHandler implements InternalSecurityManager.CommitHandler
       String token = tokenizer.nextToken();
       if (token != null && token.length() != 0)
       {
-        Check check = (Check)EcoreUtil.create(checkClass);
-        check.setAccess(access);
-        check.eSet(checkFeature, modelElement);
+        Permission permission = (Permission)EcoreUtil.create(permissionClass);
+        permission.setAccess(access);
+        permission.eSet(permissionFeature, modelElement);
 
         Role role = RealmUtil.findRole(items, token);
         if (role == null)
@@ -146,7 +146,7 @@ public class AnnotationHandler implements InternalSecurityManager.CommitHandler
           items.add(role);
         }
 
-        role.getChecks().add(check);
+        role.getPermissions().add(permission);
       }
     }
   }
author	Eike Stepper	2012-06-12 08:59:13 +0000
committer	Eike Stepper	2012-06-12 08:59:13 +0000
commit	cc7297c466f9b2d42d859161f04693840d1a2a1a (patch)
tree	d66ec90f093147bc630d353264fcc7b2cfa1f6db
parent	c049a4699cf639cf223189d564b47eea2dc19ddd (diff)
download	cdo-cc7297c466f9b2d42d859161f04693840d1a2a1a.tar.gz cdo-cc7297c466f9b2d42d859161f04693840d1a2a1a.tar.xz cdo-cc7297c466f9b2d42d859161f04693840d1a2a1a.zip