cvs commit: jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic HibernateModelManagerImpl.java

[epugh]

epugh       2004/07/07 10:25:04

  Modified:    
security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic
                        HibernateModelManagerImpl.java
  Log:
  Simplify the updates on grants
  
  Revision  Changes    Path
  1.6       +10 -17    
jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic/HibernateModelManagerImpl.java
  
  Index: HibernateModelManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic/HibernateModelManagerImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HibernateModelManagerImpl.java    7 Jul 2004 17:17:29 -0000       1.5
  +++ HibernateModelManagerImpl.java    7 Jul 2004 17:25:04 -0000       1.6
  @@ -145,11 +145,8 @@
               {
                   ((DynamicRole) role).addPermission(permission);
                   ((DynamicPermission) permission).addRole(role);
  -                Session session = getPersistenceHelper().retrieveSession();
  -                Transaction transaction = session.beginTransaction();
  -                session.update(role);
  -                session.update(permission);
  -                transaction.commit();
  +                getPersistenceHelper().updateEntity(permission);
  +                getPersistenceHelper().updateEntity(role);                
                   return;
               }
           }
  @@ -186,7 +183,9 @@
               if (roleExists && permissionExists)
               {
                   ((DynamicRole) role).removePermission(permission);
  -                             getPersistenceHelper().updateEntity(role);
  +                ((DynamicPermission) permission).removeRole(role);
  +                getPersistenceHelper().updateEntity(role);
  +                getPersistenceHelper().updateEntity(permission);
                   return;
               }
           }
  @@ -268,11 +267,8 @@
               {
                   ((DynamicUser) user).addGroup(group);
                   ((DynamicGroup) group).addUser(user);
  -                Session session = getPersistenceHelper().retrieveSession();
  -                Transaction transaction = session.beginTransaction();
  -                session.update(user);
  -                session.update(group);
  -                transaction.commit();
  +                getPersistenceHelper().updateEntity(group);
  +                getPersistenceHelper().updateEntity(user);   
                   return;
               }
           }
  @@ -391,11 +387,8 @@
               {
                   ((DynamicGroup) group).addRole(role);
                   ((DynamicRole) role).addGroup(group);
  -                Session session = getPersistenceHelper().retrieveSession();
  -                Transaction transaction = session.beginTransaction();
  -                session.update(role);
  -                session.update(group);
  -                transaction.commit();
  +                getPersistenceHelper().updateEntity(group);
  +                getPersistenceHelper().updateEntity(role);   
                   return;
               }
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]