epugh       2003/08/25 08:31:41

  Modified:    security/src/test/org/apache/fulcrum/security/model/simple/manager
                        AbstractRoleManagerTest.java
                        AbstractGroupManagerTest.java
                        AbstractUserManagerTest.java
               security/src/java/org/apache/fulcrum/security/spi/memory/simple
                        MemoryUserManagerImpl.java
                        MemoryGroupManagerImpl.java
               security/src/java/org/apache/fulcrum/security/spi/hibernate/simple
                        HibernateGroupManagerImpl.java
                        BaseHibernateManager.java
                        HibernateRoleManagerImpl.java
                        HibernateUserManagerImpl.java
                        HibernatePermissionManagerImpl.java
               security/src/test SimpleHibernate.hbm.xml
               security/src/test/org/apache/fulcrum/security/authenticator
                        CryptoAuthenticatorTest.java
  Log:
  Fixed bug in hibernate sessions not closing.  Added tests for many to many
  
  Revision  Changes    Path
  1.3       +5 -0      
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractRoleManagerTest.java
  
  Index: AbstractRoleManagerTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractRoleManagerTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractRoleManagerTest.java      25 Aug 2003 01:06:14 -0000      1.2
  +++ AbstractRoleManagerTest.java      25 Aug 2003 15:31:40 -0000      1.3
  @@ -8,6 +8,7 @@
   import org.apache.fulcrum.security.SecurityService;
   import org.apache.fulcrum.security.entity.Permission;
   import org.apache.fulcrum.security.entity.Role;
  +import org.apache.fulcrum.security.model.simple.entity.SimpleRole;
   import org.apache.fulcrum.security.util.PermissionSet;
   import org.apache.fulcrum.security.util.RoleSet;
   import org.apache.fulcrum.security.util.UnknownEntityException;
  @@ -158,6 +159,7 @@
           role = roleManager.getRoleInstance("TEST_ROLE");
           roleManager.addRole(role);
           ((SimpleRoleManager) roleManager).grant(role, permission);
  +             assertTrue(((SimpleRole) role).getPermissions().contains(permission));
       }
       public void testRevokeUserGroup() throws Exception
       {
  @@ -168,6 +170,9 @@
           roleManager.addRole(role);
           ((SimpleRoleManager) roleManager).grant(role, permission);
           ((SimpleRoleManager) roleManager).revoke(role, permission);
  +             
  +             assertFalse(((SimpleRole) role).getPermissions().contains(permission));
  +             
       }
       public void testAddRole() throws Exception
       {
  
  
  
  1.2       +17 -7     
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractGroupManagerTest.java
  
  Index: AbstractGroupManagerTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractGroupManagerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractGroupManagerTest.java     24 Aug 2003 19:48:35 -0000      1.1
  +++ AbstractGroupManagerTest.java     25 Aug 2003 15:31:40 -0000      1.2
  @@ -9,6 +9,8 @@
   import org.apache.fulcrum.security.SecurityService;
   import org.apache.fulcrum.security.entity.Group;
   import org.apache.fulcrum.security.entity.Role;
  +import org.apache.fulcrum.security.model.simple.entity.SimpleGroup;
  +import org.apache.fulcrum.security.model.simple.entity.SimpleRole;
   import org.apache.fulcrum.security.util.GroupSet;
   import org.apache.fulcrum.security.util.UnknownEntityException;
   import org.apache.fulcrum.testcontainer.BaseUnitTest;
  @@ -78,13 +80,12 @@
       }
       public void testGetGroupByName() throws Exception
       {
  -        
           group = groupManager.getGroupInstance("CLEAN_KENNEL");
           groupManager.addGroup(group);
           Group group2 = groupManager.getGroupByName("CLEAN_KENNEL");
           assertEquals(group.getName(), group2.getName());
  -             group2 = groupManager.getGroupByName("Clean_KeNNel");
  -             assertEquals(group.getName(), group2.getName());
  +        group2 = groupManager.getGroupByName("Clean_KeNNel");
  +        assertEquals(group.getName(), group2.getName());
       }
       public void testGetGroupById() throws Exception
       {
  @@ -95,17 +96,19 @@
       }
       public void testGetAllGroups() throws Exception
       {
  -     int size = groupManager.getAllGroups().size();
  +        int size = groupManager.getAllGroups().size();
           group = groupManager.getGroupInstance("CLEAN_KENNEL_J");
           groupManager.addGroup(group);
           GroupSet groupSet = groupManager.getAllGroups();
  -        assertEquals(size+1, groupSet.size());
  +        assertEquals(size + 1, groupSet.size());
       }
       public void testRemoveGroup() throws Exception
       {
           group = groupManager.getGroupInstance("CLEAN_KENNEL_K");
           groupManager.addGroup(group);
           int size = groupManager.getAllGroups().size();
  +             assertEquals(0,((SimpleGroup)group).getUsers().size());
  +             assertEquals(0,((SimpleGroup)group).getRoles().size());
           groupManager.removeGroup(group);
           try
           {
  @@ -142,7 +145,7 @@
           groupManager.addGroup(group);
           assertNotNull(groupManager.getGroupById(group.getId()));
       }
  -    public void testGrantUserGroup() throws Exception
  +    public void testGrantGroupRole() throws Exception
       {
           Role role = securityService.getRoleManager().getRoleInstance();
           role.setName("TEST_PERMISSION");
  @@ -150,8 +153,12 @@
           group = groupManager.getGroupInstance("TEST_ROLE");
           groupManager.addGroup(group);
           ((SimpleGroupManager) groupManager).grant(group, role);
  +        group = groupManager.getGroupByName("TEST_ROLE");
  +             assertTrue(((SimpleGroup) group).getRoles().contains(role));
  +             assertTrue(((SimpleRole) role).getGroups().contains(group));
  +             
       }
  -    public void testRevokeUserGroup() throws Exception
  +    public void testRevokeGroupRole() throws Exception
       {
           Role role = securityService.getRoleManager().getRoleInstance();
           role.setName("TEST_PERMISSION2");
  @@ -160,5 +167,8 @@
           groupManager.addGroup(group);
           ((SimpleGroupManager) groupManager).grant(group, role);
           ((SimpleGroupManager) groupManager).revoke(group, role);
  +        group = groupManager.getGroupByName("Lima2");
  +             assertFalse(((SimpleGroup) group).getRoles().contains(role));
  +             assertFalse(((SimpleRole) role).getGroups().contains(group));
       }
   }
  
  
  
  1.3       +9 -1      
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractUserManagerTest.java
  
  Index: AbstractUserManagerTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractUserManagerTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractUserManagerTest.java      25 Aug 2003 01:06:14 -0000      1.2
  +++ AbstractUserManagerTest.java      25 Aug 2003 15:31:40 -0000      1.3
  @@ -10,6 +10,7 @@
   import org.apache.fulcrum.security.acl.AccessControlList;
   import org.apache.fulcrum.security.entity.Group;
   import org.apache.fulcrum.security.entity.User;
  +import org.apache.fulcrum.security.model.simple.entity.SimpleGroup;
   import org.apache.fulcrum.security.model.simple.entity.SimpleUser;
   import org.apache.fulcrum.security.util.PasswordMismatchException;
   import org.apache.fulcrum.security.util.UnknownEntityException;
  @@ -163,7 +164,11 @@
           ((SimpleUserManager) userManager).grant(user, group);
           ((SimpleUserManager) userManager).grant(user, group2);
           userManager.revokeAll(user);
  -        assertEquals(0, ((SimpleUser) user).getGroups().size());
  +             assertEquals(0, ((SimpleUser) user).getGroups().size());
  +             group = 
securityService.getGroupManager().getGroupByName("TEST_REVOKEALL");
  +             group2 = 
securityService.getGroupManager().getGroupByName("TEST_REVOKEALL2");
  +             assertFalse(((SimpleGroup) group).getUsers().contains(user));
  +             assertFalse(((SimpleGroup) group2).getUsers().contains(user));
       }
       /**
        * Need to figure out if save is something we want..  
  @@ -189,6 +194,8 @@
           userManager.addUser(user, "clint");
           ((SimpleUserManager) userManager).grant(user, group);
           assertTrue(((SimpleUser) user).getGroups().contains(group));
  +             assertTrue(((SimpleGroup)group).getUsers().contains(user));
  +        
       }
       public void testRevokeUserGroup() throws Exception
       {
  @@ -199,6 +206,7 @@
           userManager.addUser(user, "pet");
           ((SimpleUserManager) userManager).revoke(user, group);
           assertFalse(((SimpleUser) user).getGroups().contains(group));
  +             assertFalse(((SimpleGroup)group).getUsers().contains(user));
       }
   
       public void testGetACL() throws Exception
  
  
  
  1.3       +9 -3      
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/memory/simple/MemoryUserManagerImpl.java
  
  Index: MemoryUserManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/memory/simple/MemoryUserManagerImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MemoryUserManagerImpl.java        25 Aug 2003 01:05:25 -0000      1.2
  +++ MemoryUserManagerImpl.java        25 Aug 2003 15:31:40 -0000      1.3
  @@ -382,6 +382,10 @@
               userExists = checkExists(user);
               if (userExists)
               {
  +             for (Iterator i = ((SimpleUser) 
user).getGroups().iterator();i.hasNext();){
  +                                     SimpleGroup group = (SimpleGroup)i.next();
  +                                     group.removeUser(user);
  +             }
                   ((SimpleUser) user).setGroups(new GroupSet());
                   return;
               }
  @@ -671,7 +675,8 @@
               userExists = checkExists(user);
               if (groupExists && userExists)
               {
  -                ((SimpleUser) user).addGroup(group);
  +                             ((SimpleUser) user).addGroup(group);
  +                             ((SimpleGroup) group).addUser(user);
                   return;
               }
           }
  @@ -711,7 +716,8 @@
               userExists = checkExists(user);
               if (groupExists && userExists)
               {
  -                ((SimpleUser) user).removeGroup(group);
  +                             ((SimpleUser) user).removeGroup(group);
  +                             ((SimpleGroup) group).removeUser(user);
                   return;
               }
           }
  
  
  
  1.3       +6 -3      
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/memory/simple/MemoryGroupManagerImpl.java
  
  Index: MemoryGroupManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/memory/simple/MemoryGroupManagerImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MemoryGroupManagerImpl.java       24 Aug 2003 19:42:29 -0000      1.2
  +++ MemoryGroupManagerImpl.java       25 Aug 2003 15:31:40 -0000      1.3
  @@ -67,6 +67,7 @@
   import org.apache.fulcrum.security.entity.Group;
   import org.apache.fulcrum.security.entity.Role;
   import org.apache.fulcrum.security.model.simple.entity.SimpleGroup;
  +import org.apache.fulcrum.security.model.simple.entity.SimpleRole;
   import org.apache.fulcrum.security.model.simple.manager.*;
   import org.apache.fulcrum.security.util.DataBackendException;
   import org.apache.fulcrum.security.util.EntityExistsException;
  @@ -355,7 +356,8 @@
               roleExists = checkExists(role);
               if (groupExists && roleExists)
               {
  -                ((SimpleGroup) group).addRole(role);
  +                             ((SimpleGroup) group).addRole(role);
  +                             ((SimpleRole) role).addGroup(group);
                   return;
               }
           }
  @@ -391,7 +393,8 @@
               roleExists = checkExists(role);
               if (groupExists && roleExists)
               {
  -                ((SimpleGroup) group).removeRole(role);
  +                             ((SimpleGroup) group).removeRole(role);
  +                             ((SimpleRole) role).removeGroup(group);
                   return;
               }
           }
  
  
  
  1.4       +14 -5     
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernateGroupManagerImpl.java
  
  Index: HibernateGroupManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernateGroupManagerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HibernateGroupManagerImpl.java    24 Aug 2003 19:41:35 -0000      1.3
  +++ HibernateGroupManagerImpl.java    25 Aug 2003 15:31:40 -0000      1.4
  @@ -63,7 +63,10 @@
   import org.apache.fulcrum.security.entity.Group;
   import org.apache.fulcrum.security.entity.Role;
   import org.apache.fulcrum.security.model.simple.manager.SimpleGroupManager;
  +import org.apache.fulcrum.security.model.simple.entity.SimpleGroup;
  +import org.apache.fulcrum.security.model.simple.entity.SimpleRole;
   import org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup;
  +import org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleRole;
   import org.apache.fulcrum.security.util.DataBackendException;
   import org.apache.fulcrum.security.util.EntityExistsException;
   import org.apache.fulcrum.security.util.GroupSet;
  @@ -186,6 +189,7 @@
               session = hibernateService.openSession();
               List groups = session.find("from HibernateSimpleGroup");
               groupSet.add(groups);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  @@ -245,6 +249,7 @@
           {
               session = hibernateService.openSession();
               groups = session.find("from HibernateSimpleGroup sg where sg.name=?", 
group.getName(), Hibernate.STRING);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  @@ -302,8 +307,10 @@
               roleExists = checkExists(role);
               if (groupExists && roleExists)
               {
  -                ((HibernateSimpleGroup) group).addRole(role);
  -                updateEntity(group);
  +                             ((HibernateSimpleGroup) group).addRole(role);
  +                             ((HibernateSimpleRole) role).addGroup(group);
  +                             updateEntity(group);
  +                             //updateEntity(role);
                   return;
               }
           }
  @@ -339,8 +346,10 @@
               roleExists = checkExists(role);
               if (groupExists && roleExists)
               {
  -                ((HibernateSimpleGroup) group).removeRole(role);
  -                updateEntity(group);
  +                             ((SimpleGroup) group).removeRole(role);
  +                             ((SimpleRole) role).removeGroup(group);
  +                             updateEntity(group);
  +                             //updateEntity(role);
                   return;
               }
           }
  
  
  
  1.3       +7 -3      
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/BaseHibernateManager.java
  
  Index: BaseHibernateManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/BaseHibernateManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseHibernateManager.java 25 Aug 2003 01:02:01 -0000      1.2
  +++ BaseHibernateManager.java 25 Aug 2003 15:31:40 -0000      1.3
  @@ -157,6 +157,7 @@
               transaction = session.beginTransaction();
               session.delete(entity);
               transaction.commit();
  +                     session.close();
           }
           catch (HibernateException he)
           {
  @@ -167,7 +168,7 @@
               catch (HibernateException hex)
               {
               }
  -            throw new DataBackendException("Problem removing entity.", he);
  +            throw new DataBackendException("Problem removing entity:" + 
he.getMessage(), he);
           }
       }
       /**
  @@ -186,6 +187,7 @@
               transaction = session.beginTransaction();
               session.update(entity);
               transaction.commit();
  +            session.close();
           }
           catch (HibernateException he)
           {
  @@ -196,7 +198,7 @@
               catch (HibernateException hex)
               {
               }
  -            throw new DataBackendException("renameRole(s,name)", he);
  +            throw new DataBackendException("updateEntity(" + entity+")", he);
           }
           return;
       }
  @@ -216,6 +218,7 @@
               transaction = session.beginTransaction();
               session.save(entity);
               transaction.commit();
  +                     session.close();
           }
           catch (HibernateException he)
           {
  @@ -246,6 +249,7 @@
               transaction = session.beginTransaction();
               session.delete(entity);
               transaction.commit();
  +                     session.close();
           }
           catch (HibernateException he)
           {
  
  
  
  1.4       +3 -1      
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernateRoleManagerImpl.java
  
  Index: HibernateRoleManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernateRoleManagerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HibernateRoleManagerImpl.java     24 Aug 2003 19:41:35 -0000      1.3
  +++ HibernateRoleManagerImpl.java     25 Aug 2003 15:31:40 -0000      1.4
  @@ -311,6 +311,7 @@
           {
               session = hibernateService.openSession();
               roles = session.find("from HibernateSimpleRole sr where sr.name=?", 
role.getName(), Hibernate.STRING);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  @@ -337,6 +338,7 @@
               session = hibernateService.openSession();
               List roles = session.find("from HibernateSimpleRole");
               roleSet.add(roles);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  
  
  
  1.5       +9 -4      
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernateUserManagerImpl.java
  
  Index: HibernateUserManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernateUserManagerImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HibernateUserManagerImpl.java     25 Aug 2003 01:02:01 -0000      1.4
  +++ HibernateUserManagerImpl.java     25 Aug 2003 15:31:40 -0000      1.5
  @@ -128,6 +128,7 @@
           {
               session = hibernateService.openSession();
               users = session.find("from HibernateSimpleUser su where su.name=?", 
userName, Hibernate.STRING);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  @@ -158,6 +159,7 @@
               session = hibernateService.openSession();
               users =
                   session.find("from HibernateSimpleUser su where su.name=?", 
userName.toLowerCase(), Hibernate.STRING);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  @@ -519,8 +521,10 @@
               userExists = checkExists(user);
               if (groupExists && userExists)
               {
  -                ((SimpleUser) user).addGroup(group);
  -                updateEntity(user);
  +                             ((SimpleUser) user).addGroup(group);
  +                             ((SimpleGroup) group).addUser(user);
  +                             updateEntity(user);
  +                             //updateEntity(group);
                   return;
               }
           }
  @@ -560,7 +564,8 @@
               userExists = checkExists(user);
               if (groupExists && userExists)
               {
  -                ((SimpleUser) user).removeGroup(group);
  +                             ((SimpleUser) user).removeGroup(group);
  +
                   updateEntity(user);
                   return;
               }
  
  
  
  1.4       +3 -1      
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernatePermissionManagerImpl.java
  
  Index: HibernatePermissionManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/spi/hibernate/simple/HibernatePermissionManagerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HibernatePermissionManagerImpl.java       24 Aug 2003 19:41:35 -0000      1.3
  +++ HibernatePermissionManagerImpl.java       25 Aug 2003 15:31:40 -0000      1.4
  @@ -170,6 +170,7 @@
               session = hibernateService.openSession();
               List permissions = session.find("from SimplePermission");
               permissionSet.add(permissions);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  @@ -219,6 +220,7 @@
               session = hibernateService.openSession();
               permissions =
                   session.find("from SimplePermission sr where sr.name=?", 
permission.getName(), Hibernate.STRING);
  +                     session.close();
           }
           catch (HibernateException e)
           {
  
  
  
  1.2       +13 -3     
jakarta-turbine-fulcrum/security/src/test/SimpleHibernate.hbm.xml
  
  Index: SimpleHibernate.hbm.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/test/SimpleHibernate.hbm.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleHibernate.hbm.xml   24 Aug 2003 19:46:41 -0000      1.1
  +++ SimpleHibernate.hbm.xml   25 Aug 2003 15:31:41 -0000      1.2
  @@ -17,10 +17,15 @@
           </id>
         <property name="name" column="NAME" type="string"/>      
         
  -       <set name="hibernatePermissions" lazy="true" table="ROLE_PERMISSION">
  +       <set name="hibernatePermissions" lazy="false" table="ROLE_PERMISSION">
           <key column="ROLE_ID"/>
           <many-to-many 
class="org.apache.fulcrum.security.model.simple.entity.SimplePermission" 
column="PERMISSION_ID"/> 
         </set>
  +      
  +       <set name="hibernateGroups" lazy="false" table="GROUP_ROLE" inverse="true">
  +        <key column="ROLE_ID"/>
  +        <many-to-many 
class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup" 
column="GROUP_ID"/> 
  +      </set>         
       </class>   
   
       <class 
name="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup" 
table="GROUP" >
  @@ -29,10 +34,15 @@
           </id>
         <property name="name" column="NAME" type="string"/>      
         
  -       <set name="hibernateRoles" lazy="true" table="GROUP_ROLE">
  +       <set name="hibernateRoles" lazy="false" table="GROUP_ROLE" 
cascade="save-update">
           <key column="GROUP_ID"/>
           <many-to-many 
class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleRole" 
column="ROLE_ID"/> 
         </set>
  +      
  +       <set name="users" lazy="false" table="HIBUSER_GROUP" inverse="true">
  +        <key column="GROUP_ID"/>
  +        <many-to-many 
class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleUser" 
column="USER_ID"/> 
  +      </set>        
       </class>   
   
       <class 
name="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleUser" 
table="HIBUSER" >
  @@ -42,7 +52,7 @@
         <property name="name" column="USERNAME" type="string"/>      
         <property name="password" column="PASSWORD" type="string"/>            
         
  -       <set name="hibernateGroups" lazy="true" table="HIBUSER_GROUP">
  +       <set name="hibernateGroups" lazy="false" table="HIBUSER_GROUP" 
inverse="true">
           <key column="USER_ID"/>
           <many-to-many 
class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup" 
column="GROUP_ID"/> 
         </set>
  
  
  
  1.2       +0 -1      
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
  
  Index: CryptoAuthenticatorTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CryptoAuthenticatorTest.java      25 Aug 2003 01:06:14 -0000      1.1
  +++ CryptoAuthenticatorTest.java      25 Aug 2003 15:31:41 -0000      1.2
  @@ -3,7 +3,6 @@
    *
    */
   package org.apache.fulcrum.security.authenticator;
  -import org.apache.fulcrum.security.SecurityService;
   import org.apache.fulcrum.security.entity.User;
   import org.apache.fulcrum.security.model.simple.entity.SimpleUser;
   import org.apache.fulcrum.testcontainer.BaseUnitTest;
  
  
  

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

Reply via email to