Index: topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java
diff -u topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java:1.6 topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java:1.7
--- topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java:1.6	Thu Oct  5 07:49:44 2006
+++ topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.java	Wed Oct 18 15:28:13 2006
@@ -42,8 +42,8 @@
         principals = new HashSet();
     }
 
-    public TopiaEntityAuthorizationImpl(String id, int actions, Set<Principal> principals) {
-        this.id = id;
+    public TopiaEntityAuthorizationImpl(String expression, int actions, Set<Principal> principals) {
+        this.expression = expression;
         this.actions = actions;
         this.principals = new HashSet();
         for (Principal principal : principals) {

Index: topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.java
diff -u topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.java:1.8 topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.java:1.9
--- topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.java:1.8	Wed Oct 18 08:50:52 2006
+++ topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.java	Wed Oct 18 15:28:13 2006
@@ -43,7 +43,7 @@
      * @return vrai si l'autorisation implique l'autre
      */
     public boolean implies(TopiaAuthorization other) {
-        return impliesId(getId(), other.getId()) && 
+        return impliesExpression(getExpression(), other.getExpression()) && 
                 impliesActions(getActions(), other.getActions()) &&
                     impliesPrincipals(getPrincipals(), other.getPrincipals());
     }
@@ -55,11 +55,11 @@
      * @param thatId un autre identifiant
      * @return vrai si thisId implique thatId
      */
-    public boolean impliesId(String thisId, String thatId) {
-        return (thisId.equals(thatId) ||
-                "*".equals(thisId) ||
-                (thatId.startsWith(thisId.substring(0, thisId.length()-1))
-                        && thisId.endsWith("#*")));
+    public boolean impliesExpression(String thisExpression, String thatExpression) {
+        return (thisExpression.equals(thatExpression) ||
+                "*".equals(thisExpression) ||
+                (thatExpression.startsWith(thisExpression.substring(0, thisExpression.length()-1))
+                        && thisExpression.endsWith("#*")));
     }
 
     /**

Index: topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java
diff -u topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java:1.6 topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java:1.7
--- topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java:1.6	Thu Oct  5 07:49:44 2006
+++ topia-security/src/java/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java	Wed Oct 18 15:28:13 2006
@@ -55,7 +55,7 @@
      * (non-Javadoc)
      * @see org.codelutin.topia.security.entities.authorization.TopiaAuthorization#getId()
      */
-    public String getId() {
+    public String getExpression() {
         return idBeginAssociation;
     }
 
@@ -63,13 +63,13 @@
      * (non-Javadoc)
      * @see org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl#impliesId(java.lang.String, java.lang.String)
      */
-    public boolean impliesId(String thisId, String thatId) {
+    public boolean impliesExpression(String thisExpression, String thatExpression) {
         String select = "count(test)";
-        String from = TopiaId.getClassNameAsString(thisId) + " test join test." + nameAssociation + " as association";
+        String from = TopiaId.getClassNameAsString(thisExpression) + " test join test." + nameAssociation + " as association";
         String where = "test.topiaId=? and association.topiaId=?";
         TopiaContext context = getTopiaContext();
         try {
-            List find = context.find("select " + select + " from " + from + " where " + where, new Object[]{thisId, thatId});
+            List find = context.find("select " + select + " from " + from + " where " + where, new Object[]{thisExpression, thatExpression});
             return (Long)find.get(0) >= 1;
         } catch (TopiaException e) {
             e.printStackTrace();