You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/01/10 17:13:49 UTC
cvs commit: jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate HibernateUserManagerImpl.java
epugh 2004/01/10 08:13:49
Modified: security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic
HibernateModelManagerImpl.java
security/hibernate/src/test/org/apache/fulcrum/security/hibernate
PersistenceHelperTest.java
security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic
HibernateBasicModelManagerTest.java
security/hibernate/src/java/org/apache/fulcrum/security/hibernate/basic
HibernateModelManagerImpl.java
security/hibernate/src/java/org/apache/fulcrum/security/hibernate
HibernateUserManagerImpl.java
Log:
Fix tests. Fix bug in transaction commit
Revision Changes Path
1.3 +4 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HibernateModelManagerImpl.java 9 Jan 2004 18:30:39 -0000 1.2
+++ HibernateModelManagerImpl.java 10 Jan 2004 16:13:49 -0000 1.3
@@ -297,10 +297,11 @@
userExists = getUserManager().checkExists(user);
if (groupExists && userExists)
{
- ((DynamicUser) user).removeGroup(group);
- ((DynamicGroup) group).removeUser(user);
+
Session session = getPersistenceHelper().retrieveSession();
Transaction transaction = session.beginTransaction();
+ ((DynamicUser) user).removeGroup(group);
+ ((DynamicGroup) group).removeUser(user);
session.update(user);
session.update(group);
transaction.commit();
1.2 +9 -3 jakarta-turbine-fulcrum/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/PersistenceHelperTest.java
Index: PersistenceHelperTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/PersistenceHelperTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PersistenceHelperTest.java 5 Dec 2003 23:20:25 -0000 1.1
+++ PersistenceHelperTest.java 10 Jan 2004 16:13:49 -0000 1.2
@@ -54,6 +54,8 @@
*/
import net.sf.hibernate.avalon.HibernateService;
+import net.sf.hibernate.avalon.HibernateServiceImpl;
+
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
@@ -85,14 +87,18 @@
(HibernateService) lookup(HibernateService.ROLE);
HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ HibernateService hibernateService2 = new HibernateServiceImpl();
+
+ assertNotSame(hibernateService,hibernateService2);
SecurityService securityService = (SecurityService) lookup(SecurityService.ROLE);
HibernateGroupManagerImpl groupManager = (HibernateGroupManagerImpl)securityService.getGroupManager();
- assertNotSame(hibernateService,groupManager.getPersistenceHelper().getHibernateService());
- groupManager.getPersistenceHelper().setHibernateService(hibernateService);
assertSame(hibernateService,groupManager.getPersistenceHelper().getHibernateService());
+ groupManager.getPersistenceHelper().setHibernateService(hibernateService2);
+ assertSame(hibernateService2,groupManager.getPersistenceHelper().getHibernateService());
HibernateRoleManagerImpl roleManager = (HibernateRoleManagerImpl)securityService.getRoleManager();
+ assertSame(hibernateService2,roleManager.getPersistenceHelper().getHibernateService());
assertNotSame(hibernateService,roleManager.getPersistenceHelper().getHibernateService());
roleManager.getPersistenceHelper().setHibernateService(hibernateService);
assertSame(roleManager.getPersistenceHelper().getHibernateService(),groupManager.getPersistenceHelper().getHibernateService());
1.2 +17 -1 jakarta-turbine-fulcrum/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java
Index: HibernateBasicModelManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernateBasicModelManagerTest.java 5 Dec 2003 23:20:25 -0000 1.1
+++ HibernateBasicModelManagerTest.java 10 Jan 2004 16:13:49 -0000 1.2
@@ -53,11 +53,16 @@
* <http://www.apache.org/>.
*/
+
+import net.sf.hibernate.Transaction;
import net.sf.hibernate.avalon.HibernateService;
import org.apache.fulcrum.security.SecurityService;
+import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.hibernate.HibernateHelper;
+import org.apache.fulcrum.security.hibernate.HibernateUserManagerImpl;
+import org.apache.fulcrum.security.model.basic.entity.BasicUser;
import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -77,6 +82,17 @@
super.setUp();
}
+
+ public void testRevokeAllUser() throws Exception{
+ super.testRevokeAllUser();
+ ((HibernateUserManagerImpl)userManager).getPersistenceHelper().retrieveSession().close();
+ Transaction tx = ((HibernateUserManagerImpl)userManager).getPersistenceHelper().retrieveSession().beginTransaction();
+ User user = userManager.getUserInstance("Clint2");
+ assertEquals(0, ((BasicUser) user).getGroups().size());
+ tx.commit();
+
+ }
+
public void tearDown()
{
try
1.3 +4 -3 jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/basic/HibernateModelManagerImpl.java
Index: HibernateModelManagerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/basic/HibernateModelManagerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HibernateModelManagerImpl.java 9 Jan 2004 18:30:39 -0000 1.2
+++ HibernateModelManagerImpl.java 10 Jan 2004 16:13:49 -0000 1.3
@@ -142,10 +142,11 @@
userExists = getUserManager().checkExists(user);
if (groupExists && userExists)
{
- ((BasicUser) user).removeGroup(group);
- ((BasicGroup) group).removeUser(user);
+
Session session = getPersistenceHelper().retrieveSession();
Transaction transaction = session.beginTransaction();
+ ((BasicUser) user).removeGroup(group);
+ ((BasicGroup) group).removeUser(user);
session.update(user);
session.update(group);
transaction.commit();
1.2 +29 -1 jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java
Index: HibernateUserManagerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/HibernateUserManagerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernateUserManagerImpl.java 5 Dec 2003 23:20:24 -0000 1.1
+++ HibernateUserManagerImpl.java 10 Jan 2004 16:13:49 -0000 1.2
@@ -63,6 +63,7 @@
import org.apache.fulcrum.security.spi.AbstractUserManager;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
+import org.apache.fulcrum.security.util.UserSet;
/**
* This implementation persists to a database via Hibernate.
*
@@ -140,6 +141,33 @@
throw new UnknownEntityException("Unknown user '" + userName + "'");
}
+ /**
+ * Retrieves all users defined in the system.
+ *
+ * @return the names of all users defined in the system.
+ * @throws DataBackendException if there was an error accessing the data
+ * backend.
+ */
+ public UserSet getAllUsers() throws DataBackendException
+ {
+ UserSet userSet = new UserSet();
+ try
+ {
+
+ List users =
+ getPersistenceHelper().retrieveSession().find(
+ "from " + User.class.getName() + "");
+ userSet.add(users);
+ }
+ catch (HibernateException e)
+ {
+ throw new DataBackendException(
+ "Error retriving all users",
+ e);
+ }
+ return userSet;
+
+ }
/**
* Removes an user account from the system.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org