epugh       2003/10/30 12:44:04

  Modified:    security/src/java/org/apache/fulcrum/security/spi/hibernate/simple
                        HibernateRoleManagerImpl.java
                        HibernateGroupManagerImpl.java
                        HibernatePermissionManagerImpl.java
                        HibernateUserManagerImpl.java
  Log:
  Use the full class name, allows the objects to be overridden by users!
  
  Revision  Changes    Path
  1.9       +3 -3      
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HibernateRoleManagerImpl.java     30 Oct 2003 14:25:36 -0000      1.8
  +++ HibernateRoleManagerImpl.java     30 Oct 2003 20:44:03 -0000      1.9
  @@ -194,7 +194,7 @@
           try
           {
               
  -            roles = retrieveSession().find("from HibernateSimpleRole sr where 
sr.name=?", role.getName(), Hibernate.STRING);
  +            roles = retrieveSession().find("from " + 
HibernateSimpleRole.class.getName() + " sr where sr.name=?", role.getName(), 
Hibernate.STRING);
   
           }
           catch (HibernateException e)
  @@ -219,7 +219,7 @@
           RoleSet roleSet = new RoleSet();
           try
           {
  -            List roles = retrieveSession().find("from HibernateSimpleRole");
  +            List roles = retrieveSession().find("from " + 
HibernateSimpleRole.class.getName() + "");
               roleSet.add(roles);
           }
           catch (HibernateException e)
  
  
  
  1.9       +4 -4      
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HibernateGroupManagerImpl.java    30 Oct 2003 14:25:36 -0000      1.8
  +++ HibernateGroupManagerImpl.java    30 Oct 2003 20:44:03 -0000      1.9
  @@ -148,7 +148,7 @@
           {
             
               List groups =
  -                     retrieveSession().find("from HibernateSimpleGroup g where 
g.name=?", name.toLowerCase(), Hibernate.STRING);
  +                     retrieveSession().find("from " + 
HibernateSimpleGroup.class.getName() + " g where g.name=?", name.toLowerCase(), 
Hibernate.STRING);
               if (groups.size() == 0)
               {
                   throw new UnknownEntityException("Could not find group" + name);
  @@ -196,7 +196,7 @@
           try
           {
               
  -            List groups = retrieveSession().find("from HibernateSimpleGroup");
  +            List groups = retrieveSession().find("from " + 
HibernateSimpleGroup.class.getName() + "");
               groupSet.add(groups);
           }
           catch (HibernateException e)
  @@ -256,7 +256,7 @@
           try
           {
               
  -            groups = retrieveSession().find("from HibernateSimpleGroup sg where 
sg.name=?", group.getName(), Hibernate.STRING);
  +            groups = retrieveSession().find("from " + 
HibernateSimpleGroup.class.getName() + " sg where sg.name=?", group.getName(), 
Hibernate.STRING);
           }
           catch (HibernateException e)
           {
  
  
  
  1.9       +3 -3      
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HibernatePermissionManagerImpl.java       30 Oct 2003 14:25:36 -0000      1.8
  +++ HibernatePermissionManagerImpl.java       30 Oct 2003 20:44:03 -0000      1.9
  @@ -164,7 +164,7 @@
           try
           {
               
  -            List permissions = retrieveSession().find("from SimplePermission");
  +            List permissions = retrieveSession().find("from " + 
SimplePermission.class.getName() + "");
               permissionSet.add(permissions);
        
           }
  @@ -215,7 +215,7 @@
           {
           
               permissions =
  -                     retrieveSession().find("from SimplePermission sr where 
sr.name=?", permission.getName(), Hibernate.STRING);
  +                     retrieveSession().find("from " + 
SimplePermission.class.getName() + " sr where sr.name=?", permission.getName(), 
Hibernate.STRING);
                
           }
           catch (HibernateException e)
  
  
  
  1.10      +3 -3      
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- HibernateUserManagerImpl.java     30 Oct 2003 14:25:36 -0000      1.9
  +++ HibernateUserManagerImpl.java     30 Oct 2003 20:44:03 -0000      1.10
  @@ -124,7 +124,7 @@
           List users = null;
           try
           {
  -            users = retrieveSession().find("from HibernateSimpleUser su where 
su.name=?", userName, Hibernate.STRING);
  +            users = retrieveSession().find("from " + 
HibernateSimpleUser.class.getName() + " su where su.name=?", userName, 
Hibernate.STRING);
           }
           catch (HibernateException e)
           {
  @@ -154,7 +154,7 @@
           {
               users =
                   retrieveSession().find(
  -                    "from HibernateSimpleUser su where su.name=?",
  +                    "from " + HibernateSimpleUser.class.getName() + " su where 
su.name=?",
                       userName.toLowerCase(),
                       Hibernate.STRING);
           }
  
  
  

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

Reply via email to