You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2016/08/03 15:29:17 UTC
svn commit: r1755091 - in /turbine/fulcrum/trunk/security:
api/src/java/org/apache/fulcrum/security/
api/src/java/org/apache/fulcrum/security/spi/
torque/src/java/org/apache/fulcrum/security/torque/
torque/src/java/org/apache/fulcrum/security/torque/ba...
Author: gk
Date: Wed Aug 3 15:29:16 2016
New Revision: 1755091
URL: http://svn.apache.org/viewvc?rev=1755091&view=rev
Log:
- Fix: Make permission manager consistent
- TRB-98: Remove database getters else use XXXPeer.getXXXPeerImpl().getDatabaseName() and propagate to new instances..
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TorqueTurbinePeer.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java Wed Aug 3 15:29:16 2016
@@ -52,8 +52,9 @@ public interface PermissionManager
* @return an object implementing Permission interface.
* @throws UnknownEntityException
* if the object could not be instantiated.
+ * @throws DataBackendException
*/
- <T extends Permission> T getPermissionInstance() throws UnknownEntityException;
+ <T extends Permission> T getPermissionInstance() throws DataBackendException;
/**
* Construct a blank Permission object.
@@ -68,7 +69,7 @@ public interface PermissionManager
* @throws UnknownEntityException
* if the object could not be instantiated.
*/
- <T extends Permission> T getPermissionInstance(String permName) throws UnknownEntityException;
+ <T extends Permission> T getPermissionInstance(String permName) throws DataBackendException;
/**
* Retrieve a Permission object with specified name.
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractPermissionManager.java Wed Aug 3 15:29:16 2016
@@ -44,11 +44,11 @@ public abstract class AbstractPermission
* the default constructor.
*
* @return an object implementing Permission interface.
- * @throws UnknownEntityException
+ * @throws DataBackendException
* if the object could not be instantiated.
*/
@Override
- public <T extends Permission> T getPermissionInstance() throws UnknownEntityException
+ public <T extends Permission> T getPermissionInstance() throws DataBackendException
{
try
{
@@ -58,7 +58,7 @@ public abstract class AbstractPermission
}
catch (Exception e)
{
- throw new UnknownEntityException("Failed to instantiate a Permission implementation object", e);
+ throw new DataBackendException("Failed to instantiate a Permission implementation object", e);
}
}
@@ -72,11 +72,11 @@ public abstract class AbstractPermission
* The name of the permission.
*
* @return an object implementing Permission interface.
- * @throws UnknownEntityException
+ * @throws DataBackendException
* if the object could not be instantiated.
*/
@Override
- public <T extends Permission> T getPermissionInstance(String permName) throws UnknownEntityException
+ public <T extends Permission> T getPermissionInstance(String permName) throws DataBackendException
{
T perm = getPermissionInstance();
perm.setName(permName);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java Wed Aug 3 15:29:16 2016
@@ -110,6 +110,7 @@ public abstract class TorqueAbstractGrou
{
try
{
+
((TorqueAbstractSecurityEntity)group).save();
}
catch (Exception e)
@@ -191,7 +192,7 @@ public abstract class TorqueAbstractGrou
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getGroupInstance()).getDatabaseName());
+ con = Transaction.begin();
group = doSelectByName(name, con);
@@ -239,7 +240,8 @@ public abstract class TorqueAbstractGrou
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getGroupInstance()).getDatabaseName());
+
+ con = Transaction.begin();
List<Group> groups = doSelectAllGroups(con);
@@ -286,7 +288,7 @@ public abstract class TorqueAbstractGrou
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getGroupInstance()).getDatabaseName());
+ con = Transaction.begin();
doSelectByName(groupName, con);
@@ -341,7 +343,7 @@ public abstract class TorqueAbstractGrou
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getGroupInstance()).getDatabaseName());
+ con = Transaction.begin();
group = doSelectById((Integer)id, con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java Wed Aug 3 15:29:16 2016
@@ -147,6 +147,7 @@ public abstract class TorqueAbstractPerm
{
try
{
+
((TorqueAbstractSecurityEntity)permission).delete();
}
catch (TorqueException e)
@@ -201,7 +202,7 @@ public abstract class TorqueAbstractPerm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getPermissionInstance()).getDatabaseName());
+ con = Transaction.begin();
List<Permission> permissions = doSelectAllPermissions(con);
@@ -219,10 +220,6 @@ public abstract class TorqueAbstractPerm
{
throw new DataBackendException("Error retrieving permission information", e);
}
- catch (UnknownEntityException e)
- {
- throw new DataBackendException("Error retrieving permission information", e);
- }
finally
{
if (con != null)
@@ -253,7 +250,7 @@ public abstract class TorqueAbstractPerm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getPermissionInstance()).getDatabaseName());
+ con = Transaction.begin();
doSelectByName(permissionName, con);
@@ -274,10 +271,6 @@ public abstract class TorqueAbstractPerm
{
throw new DataBackendException("Error retrieving permission information", e);
}
- catch (UnknownEntityException e)
- {
- throw new DataBackendException("Error retrieving permission information", e);
- }
finally
{
if (con != null)
@@ -311,7 +304,7 @@ public abstract class TorqueAbstractPerm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getPermissionInstance()).getDatabaseName());
+ con = Transaction.begin();
permission = doSelectById((Integer)id, con);
@@ -362,7 +355,7 @@ public abstract class TorqueAbstractPerm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getPermissionInstance()).getDatabaseName());
+ con = Transaction.begin();
permission = doSelectByName(name, con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java Wed Aug 3 15:29:16 2016
@@ -197,7 +197,7 @@ public abstract class TorqueAbstractRole
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getRoleInstance()).getDatabaseName());
+ con = Transaction.begin();
doSelectByName(roleName, con);
@@ -244,7 +244,7 @@ public abstract class TorqueAbstractRole
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getRoleInstance()).getDatabaseName());
+ con = Transaction.begin();
List<Role> roles = doSelectAllRoles(con);
@@ -296,7 +296,7 @@ public abstract class TorqueAbstractRole
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getRoleInstance()).getDatabaseName());
+ con = Transaction.begin();
role = doSelectById((Integer)id, con);
@@ -347,7 +347,7 @@ public abstract class TorqueAbstractRole
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getRoleInstance()).getDatabaseName());
+ con = Transaction.begin();
role = doSelectByName(name, con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java Wed Aug 3 15:29:16 2016
@@ -130,7 +130,8 @@ public abstract class TorqueAbstractUser
{
try
{
- ((TorqueAbstractSecurityEntity)user).save();
+ TorqueAbstractSecurityEntity u = (TorqueAbstractSecurityEntity)user;
+ u.save();
}
catch (Exception e)
{
@@ -189,7 +190,7 @@ public abstract class TorqueAbstractUser
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getUserInstance()).getDatabaseName());
+ con = Transaction.begin();
doSelectByName(userName, con);
@@ -240,7 +241,7 @@ public abstract class TorqueAbstractUser
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getUserInstance()).getDatabaseName());
+ con = Transaction.begin();
user = doSelectByName(userName.toLowerCase(), con);
@@ -288,7 +289,7 @@ public abstract class TorqueAbstractUser
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getUserInstance()).getDatabaseName());
+ con = Transaction.begin();
List<User> users = doSelectAllUsers(con);
@@ -340,7 +341,7 @@ public abstract class TorqueAbstractUser
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)getUserInstance()).getDatabaseName());
+ con = Transaction.begin();
user = doSelectById((Integer)id, con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java Wed Aug 3 15:29:16 2016
@@ -49,7 +49,8 @@ public class TorqueBasicModelManagerImpl
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
*/
- public synchronized void grant(User user, Group group) throws DataBackendException, UnknownEntityException
+ @Override
+ public synchronized void grant(User user, Group group) throws DataBackendException, UnknownEntityException
{
boolean groupExists = getGroupManager().checkExists(group);
boolean userExists = getUserManager().checkExists(user);
@@ -63,7 +64,7 @@ public class TorqueBasicModelManagerImpl
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)user).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
@@ -106,7 +107,8 @@ public class TorqueBasicModelManagerImpl
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the user or group is not present.
*/
- public synchronized void revoke(User user, Group group) throws DataBackendException, UnknownEntityException
+ @Override
+ public synchronized void revoke(User user, Group group) throws DataBackendException, UnknownEntityException
{
boolean groupExists = getGroupManager().checkExists(group);
boolean userExists = getUserManager().checkExists(user);
@@ -120,7 +122,7 @@ public class TorqueBasicModelManagerImpl
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)user).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
@@ -163,7 +165,8 @@ public class TorqueBasicModelManagerImpl
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
*/
- public synchronized void revokeAll(User user)
+ @Override
+ public synchronized void revokeAll(User user)
throws DataBackendException, UnknownEntityException
{
boolean userExists = getUserManager().checkExists(user);
@@ -184,7 +187,7 @@ public class TorqueBasicModelManagerImpl
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)user).update(con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java Wed Aug 3 15:29:16 2016
@@ -50,7 +50,8 @@ public class TorqueDynamicModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if group or role is not present.
*/
- public synchronized void revoke(Group group, Role role)
+ @Override
+ public synchronized void revoke(Group group, Role role)
throws DataBackendException, UnknownEntityException
{
boolean groupExists = getGroupManager().checkExists(group);
@@ -65,7 +66,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)role).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
@@ -107,7 +108,8 @@ public class TorqueDynamicModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if role or permission is not present.
*/
- public synchronized void grant(Role role, Permission permission)
+ @Override
+ public synchronized void grant(Role role, Permission permission)
throws DataBackendException, UnknownEntityException
{
boolean roleExists = getRoleManager().checkExists(role);
@@ -122,7 +124,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)role).update(con);
((TorqueAbstractSecurityEntity)permission).update(con);
@@ -164,7 +166,8 @@ public class TorqueDynamicModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if role or permission is not present.
*/
- public synchronized void revoke(Role role, Permission permission)
+ @Override
+ public synchronized void revoke(Role role, Permission permission)
throws DataBackendException, UnknownEntityException
{
boolean roleExists = getRoleManager().checkExists(role);
@@ -179,7 +182,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+ con = Transaction.begin();;
((TorqueAbstractSecurityEntity)role).update(con);
((TorqueAbstractSecurityEntity)permission).update(con);
@@ -222,7 +225,8 @@ public class TorqueDynamicModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
*/
- public synchronized void grant(User user, Group group) throws DataBackendException, UnknownEntityException
+ @Override
+ public synchronized void grant(User user, Group group) throws DataBackendException, UnknownEntityException
{
boolean groupExists = getGroupManager().checkExists(group);
boolean userExists = getUserManager().checkExists(user);
@@ -236,7 +240,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)user).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
@@ -279,7 +283,8 @@ public class TorqueDynamicModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the user or group is not present.
*/
- public synchronized void revoke(User user, Group group) throws DataBackendException, UnknownEntityException
+ @Override
+ public synchronized void revoke(User user, Group group) throws DataBackendException, UnknownEntityException
{
boolean groupExists = getGroupManager().checkExists(group);
boolean userExists = getUserManager().checkExists(user);
@@ -293,7 +298,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)user).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
@@ -335,7 +340,8 @@ public class TorqueDynamicModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if group or role is not present.
*/
- public synchronized void grant(Group group, Role role)
+ @Override
+ public synchronized void grant(Group group, Role role)
throws DataBackendException, UnknownEntityException
{
boolean groupExists = getGroupManager().checkExists(group);
@@ -350,7 +356,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)role).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
@@ -389,7 +395,8 @@ public class TorqueDynamicModelManagerIm
* @param delegator A
* @param delegatee B
*/
- public synchronized void addDelegate(User delegator, User delegatee)
+ @Override
+ public synchronized void addDelegate(User delegator, User delegatee)
throws DataBackendException, UnknownEntityException
{
boolean delegatorExists = getUserManager().checkExists(delegator);
@@ -403,7 +410,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)delegator).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)delegator).update(con);
((TorqueAbstractSecurityEntity)delegatee).update(con);
@@ -444,7 +451,8 @@ public class TorqueDynamicModelManagerIm
* @param delegate A
* @param delegatee B
*/
- public synchronized void removeDelegate(User delegator, User delegatee)
+ @Override
+ public synchronized void removeDelegate(User delegator, User delegatee)
throws DataBackendException, UnknownEntityException
{
boolean delegatorExists = getUserManager().checkExists(delegator);
@@ -458,7 +466,7 @@ public class TorqueDynamicModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)delegator).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)delegator).update(con);
((TorqueAbstractSecurityEntity)delegatee).update(con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TorqueTurbinePeer.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TorqueTurbinePeer.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TorqueTurbinePeer.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TorqueTurbinePeer.java Wed Aug 3 15:29:16 2016
@@ -29,4 +29,5 @@ public interface TorqueTurbinePeer<T>
T retrieveByPK(Integer pk, Connection con)
throws TorqueException, NoRowsException, TooManyRowsException;
+
}
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java Wed Aug 3 15:29:16 2016
@@ -78,13 +78,6 @@ public abstract class TorqueAbstractSecu
public abstract void update(Connection con) throws TorqueException;
/**
- * Get the name of the connection pool associated to this object
- *
- * @return the logical Torque database name
- */
- public abstract String getDatabaseName();
-
- /**
* Delete this entity
*
* @throws TorqueException if any database operation fails
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java Wed Aug 3 15:29:16 2016
@@ -60,16 +60,7 @@ public abstract class DefaultAbstractTur
criteria.and(TurbineUserGroupRolePeer.GROUP_ID, getEntityId() );
return TurbineUserGroupRolePeer.doSelectJoinTurbineRole(criteria, con);
}
-
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
- */
- @Override
- public String getDatabaseName()
- {
- return TurbineGroupPeer.DATABASE_NAME;
- }
-
+
/**
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java Wed Aug 3 15:29:16 2016
@@ -136,14 +136,6 @@ public abstract class DefaultAbstractTur
setRoles(new RoleSet(roles));
}
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
- */
- @Override
- public String getDatabaseName()
- {
- return TurbinePermissionPeer.DATABASE_NAME;
- }
/**
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java Wed Aug 3 15:29:16 2016
@@ -159,15 +159,6 @@ public abstract class DefaultAbstractTur
}
/**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
- */
- @Override
- public String getDatabaseName()
- {
- return TurbineRolePeer.DATABASE_NAME;
- }
-
- /**
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
@Override
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java Wed Aug 3 15:29:16 2016
@@ -61,14 +61,6 @@ public abstract class DefaultAbstractTur
return TurbineUserGroupRolePeer.doSelectJoinTurbineRole(criteria, con);
}
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
- */
- @Override
- public String getDatabaseName()
- {
- return TurbineUserPeer.DATABASE_NAME;
- }
/**
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java Wed Aug 3 15:29:16 2016
@@ -62,14 +62,6 @@ public abstract class FulcrumAbstractTur
return TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineRole(criteria, con);
}
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
- */
- @Override
- public String getDatabaseName()
- {
- return TorqueTurbineGroupPeer.DATABASE_NAME;
- }
/**
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java Wed Aug 3 15:29:16 2016
@@ -62,14 +62,6 @@ public abstract class FulcrumAbstractTur
return TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineRole(criteria, con);
}
- /**
- * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
- */
- @Override
- public String getDatabaseName()
- {
- return TorqueTurbineUserPeer.DATABASE_NAME;
- }
/**
* @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java Wed Aug 3 15:29:16 2016
@@ -50,7 +50,8 @@ public class TorqueTurbineGroupManagerIm
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>)getPeerInstance()).doSelect( criteria, con );
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+ return peerInstance.doSelect( criteria, con );
}
catch ( DataBackendException e )
{
@@ -73,7 +74,8 @@ public class TorqueTurbineGroupManagerIm
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>) getPeerInstance()).retrieveByPK( id, con );
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+ return peerInstance.retrieveByPK( id, con );
}
catch ( DataBackendException e )
{
@@ -101,6 +103,7 @@ public class TorqueTurbineGroupManagerIm
try
{
TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+
criteria.where(peerInstance.getTableMap().getColumn(getColumnName()), name);
groups = peerInstance.doSelect( criteria, con );
}
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java Wed Aug 3 15:29:16 2016
@@ -51,7 +51,8 @@ public class TorqueTurbineModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if role or permission is not present.
*/
- public synchronized void grant(Role role, Permission permission)
+ @Override
+ public synchronized void grant(Role role, Permission permission)
throws DataBackendException, UnknownEntityException
{
boolean roleExists = getRoleManager().checkExists(role);
@@ -66,7 +67,7 @@ public class TorqueTurbineModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)role).update(con);
((TorqueAbstractSecurityEntity)permission).update(con);
@@ -108,7 +109,8 @@ public class TorqueTurbineModelManagerIm
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if role or permission is not present.
*/
- public synchronized void revoke(Role role, Permission permission)
+ @Override
+ public synchronized void revoke(Role role, Permission permission)
throws DataBackendException, UnknownEntityException
{
boolean roleExists = getRoleManager().checkExists(role);
@@ -123,7 +125,7 @@ public class TorqueTurbineModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)role).update(con);
((TorqueAbstractSecurityEntity)permission).update(con);
@@ -157,7 +159,8 @@ public class TorqueTurbineModelManagerIm
}
}
- public synchronized void grant(User user, Group group, Role role) throws DataBackendException, UnknownEntityException
+ @Override
+ public synchronized void grant(User user, Group group, Role role) throws DataBackendException, UnknownEntityException
{
boolean roleExists = getRoleManager().checkExists(role);
boolean userExists = getUserManager().checkExists(user);
@@ -177,7 +180,7 @@ public class TorqueTurbineModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)user).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
@@ -220,7 +223,8 @@ public class TorqueTurbineModelManagerIm
}
}
- public synchronized void revoke(User user, Group group, Role role)
+ @Override
+ public synchronized void revoke(User user, Group group, Role role)
throws DataBackendException, UnknownEntityException
{
boolean roleExists = getRoleManager().checkExists(role);
@@ -254,7 +258,7 @@ public class TorqueTurbineModelManagerIm
try
{
- con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+ con = Transaction.begin();
((TorqueAbstractSecurityEntity)user).update(con);
((TorqueAbstractSecurityEntity)group).update(con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java Wed Aug 3 15:29:16 2016
@@ -51,7 +51,8 @@ public class TorqueTurbinePermissionMana
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>) getPeerInstance()).doSelect( criteria, con );
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+ return peerInstance.doSelect( criteria, con );
}
catch ( DataBackendException e )
{
@@ -74,7 +75,8 @@ public class TorqueTurbinePermissionMana
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>) getPeerInstance()).retrieveByPK(id, con);
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+ return peerInstance.retrieveByPK(id, con);
}
catch ( DataBackendException e )
{
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java Wed Aug 3 15:29:16 2016
@@ -50,7 +50,9 @@ public class TorqueTurbineRoleManagerImp
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>) getPeerInstance()).doSelect( criteria, con );
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+
+ return peerInstance.doSelect( criteria, con );
}
catch ( DataBackendException e )
{
@@ -71,7 +73,9 @@ public class TorqueTurbineRoleManagerImp
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>) getPeerInstance()).retrieveByPK( id, con );
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+
+ return peerInstance.retrieveByPK( id, con );
}
catch ( DataBackendException e )
{
@@ -98,6 +102,7 @@ public class TorqueTurbineRoleManagerImp
try
{
TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+
criteria.where(peerInstance.getTableMap().getColumn(getColumnName()), name);
roles = peerInstance.doSelect( criteria, con );
}
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java Wed Aug 3 15:29:16 2016
@@ -96,7 +96,8 @@ public class TorqueTurbineUserManagerImp
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>) getPeerInstance()).doSelect( criteria, con );
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+ return peerInstance.doSelect( criteria, con );
}
catch ( DataBackendException e )
{
@@ -117,7 +118,8 @@ public class TorqueTurbineUserManagerImp
if ( (getCustomPeer())) {
try
{
- return ((TorqueTurbinePeer<T>) getPeerInstance()).retrieveByPK( id, con );
+ TorqueTurbinePeer<T> peerInstance = (TorqueTurbinePeer<T>)getPeerInstance();
+ return peerInstance.retrieveByPK( id, con );
}
catch ( DataBackendException e )
{
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java?rev=1755091&r1=1755090&r2=1755091&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java Wed Aug 3 15:29:16 2016
@@ -18,6 +18,9 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
+import java.sql.Connection;
+import java.sql.SQLException;
+
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest;
import org.apache.fulcrum.security.torque.HsqlDB;
@@ -27,8 +30,10 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TurbineRolePermissionPeer;
import org.apache.fulcrum.security.torque.om.TurbineUserGroupRolePeer;
import org.apache.fulcrum.security.torque.om.TurbineUserPeer;
+import org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
+import org.apache.torque.util.Transaction;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -67,36 +72,49 @@ public class TurbineDefaultModelManagerT
public void tearDown()
{
// cleanup tables
+ Connection con = null;
try
{
- Criteria criteria = new Criteria();
+ con = Transaction.begin();// "default"
+
+ Criteria criteria = new Criteria();
criteria.where(TurbineUserGroupRolePeer.USER_ID, 0, Criteria.GREATER_THAN);
- TurbineUserGroupRolePeer.doDelete(criteria);
+
+ TurbineUserGroupRolePeer.doDelete(criteria,con);
criteria = new Criteria();
criteria.where(TurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TurbineRolePermissionPeer.doDelete(criteria);
+ TurbineRolePermissionPeer.doDelete(criteria,con);
criteria = new Criteria();
criteria.where(TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TurbineUserPeer.doDelete(criteria);
-
+ TurbineUserPeer.doDelete(criteria,con);
+
criteria = new Criteria();
criteria.where(TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TurbineGroupPeer.doDelete(criteria);
+ TurbineGroupPeer.doDelete(criteria,con);
criteria = new Criteria();
criteria.where(TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TurbineRolePeer.doDelete(criteria);
+ TurbineRolePeer.doDelete(criteria,con);
criteria = new Criteria();
criteria.where(TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TurbinePermissionPeer.doDelete(criteria);
+ TurbinePermissionPeer.doDelete(criteria,con);
+
+ con.commit();
+ con = null;
}
catch (TorqueException e)
{
fail(e.toString());
- }
+ } catch (SQLException e) {
+ if (con != null)
+ {
+ Transaction.safeRollback(con);
+ }
+ fail(e.toString());
+ }
modelManager = null;
securityService = null;