epugh 2003/10/30 12:21:28
Modified: security/src/test/org/apache/fulcrum/security/spi/hibernate/simple
HibernatePermissionManagerTest.java
HibernateUserManagerTest.java
HibernateGroupManagerTest.java
HibernateRoleManagerTest.java
security/src/java/org/apache/fulcrum/security/spi/hibernate/simple
BaseHibernateManager.java
Log:
Cleanup API by removing unneeded getter/setter.
Revision Changes Path
1.5 +0 -1
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernatePermissionManagerTest.java
Index: HibernatePermissionManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernatePermissionManagerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HibernatePermissionManagerTest.java 30 Oct 2003 14:25:36 -0000 1.4
+++ HibernatePermissionManagerTest.java 30 Oct 2003 20:21:27 -0000 1.5
@@ -75,7 +75,6 @@
HibernateHelper.exportSchema(hibernateService.getConfiguration());
securityService = (SecurityService) lookup(SecurityService.ROLE);
permissionManager = securityService.getPermissionManager();
- //((BaseHibernateManager)
permissionManager).setHibernateSession(hibernateService.openSession());
}
catch (Exception e)
{
1.5 +0 -2
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateUserManagerTest.java
Index: HibernateUserManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateUserManagerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HibernateUserManagerTest.java 30 Oct 2003 14:25:36 -0000 1.4
+++ HibernateUserManagerTest.java 30 Oct 2003 20:21:27 -0000 1.5
@@ -76,8 +76,6 @@
HibernateHelper.exportSchema(hibernateService.getConfiguration());
securityService = (SecurityService) lookup(SecurityService.ROLE);
userManager = securityService.getUserManager();
-
- ((BaseHibernateManager)
userManager).setHibernateSession(hibernateService.openSession());
}
catch (Exception e)
{
1.5 +0 -1
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateGroupManagerTest.java
Index: HibernateGroupManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateGroupManagerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HibernateGroupManagerTest.java 30 Oct 2003 14:25:36 -0000 1.4
+++ HibernateGroupManagerTest.java 30 Oct 2003 20:21:27 -0000 1.5
@@ -76,7 +76,6 @@
HibernateHelper.exportSchema(hibernateService.getConfiguration());
securityService = (SecurityService) lookup(SecurityService.ROLE);
groupManager = securityService.getGroupManager();
- ((BaseHibernateManager)
groupManager).setHibernateSession(hibernateService.openSession());
}
catch (Exception e)
{
1.5 +0 -1
jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateRoleManagerTest.java
Index: HibernateRoleManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateRoleManagerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HibernateRoleManagerTest.java 30 Oct 2003 14:25:36 -0000 1.4
+++ HibernateRoleManagerTest.java 30 Oct 2003 20:21:27 -0000 1.5
@@ -77,7 +77,6 @@
HibernateHelper.exportSchema(hibernateService.getConfiguration());
securityService = (SecurityService) lookup(SecurityService.ROLE);
roleManager = (RoleManager) securityService.getRoleManager();
- ((BaseHibernateManager)
roleManager).setHibernateSession(hibernateService.openSession());
}
catch (Exception e)
{
1.7 +11 -37
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseHibernateManager.java 30 Oct 2003 14:25:36 -0000 1.6
+++ BaseHibernateManager.java 30 Oct 2003 20:21:28 -0000 1.7
@@ -74,20 +74,7 @@
protected RoleManager roleManager;
protected GroupManager groupManager;
protected UserManager userManager;
- /**
- * @return
- */
- public Session getHibernateSession()
- {
- return session;
- }
- /**
- * @param session
- */
- public void setHibernateSession(Session session)
- {
- this.session = session;
- }
+
/**
* @return
*/
@@ -106,11 +93,6 @@
try
{
userManager = (UserManager) manager.lookup(UserManager.ROLE);
- ((BaseHibernateManager)
userManager).setHibernateSession(retrieveSession());
- }
- catch (HibernateException he)
- {
- throw new DataBackendException(he.getMessage(), he);
}
catch (ComponentException ce)
{
@@ -128,12 +110,7 @@
{
try
{
- permissionManager = (PermissionManager)
manager.lookup(PermissionManager.ROLE);
- ((BaseHibernateManager)
permissionManager).setHibernateSession(retrieveSession());
- }
- catch (HibernateException he)
- {
- throw new DataBackendException(he.getMessage(), he);
+ permissionManager = (PermissionManager)
manager.lookup(PermissionManager.ROLE);
}
catch (ComponentException ce)
{
@@ -152,11 +129,6 @@
try
{
roleManager = (RoleManager) manager.lookup(RoleManager.ROLE);
- ((BaseHibernateManager)
roleManager).setHibernateSession(retrieveSession());
- }
- catch (HibernateException he)
- {
- throw new DataBackendException(he.getMessage(), he);
}
catch (ComponentException ce)
{
@@ -175,11 +147,6 @@
try
{
groupManager = (GroupManager) manager.lookup(GroupManager.ROLE);
- ((BaseHibernateManager)
groupManager).setHibernateSession(retrieveSession());
- }
- catch (HibernateException he)
- {
- throw new DataBackendException(he.getMessage(), he);
}
catch (ComponentException ce)
{
@@ -311,7 +278,14 @@
}
return;
}
- protected Session retrieveSession() throws HibernateException
+
+ /**
+ * Returns a hibernate session that has been opened if it was null or not
+ * connected or not open.
+ * @return An Open hibernate session.
+ * @throws HibernateException
+ */
+ public Session retrieveSession() throws HibernateException
{
if (session == null || (!session.isConnected() && !session.isOpen()))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
