Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java?rev=1500631&r1=1500630&r2=1500631&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java Mon Jul 8 09:33:50 2013 @@ -52,35 +52,35 @@ public class TorquePermissionManagerTest * try * { * Criteria criteria = new Criteria(); - * criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicUserGroupPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicGroupRolePeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicRolePermissionPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicUserDelegatesPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN); * TorqueUserPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); * TorqueGroupPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); * TorqueRolePeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); * TorquePermissionPeer.doDelete(criteria); * } * catch (TorqueException e)
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java?rev=1500631&r1=1500630&r2=1500631&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java Mon Jul 8 09:33:50 2013 @@ -59,35 +59,35 @@ public class TorqueRoleManagerTest exten * try * { * Criteria criteria = new Criteria(); - * criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicUserGroupPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicGroupRolePeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicRolePermissionPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicUserDelegatesPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN); * TorqueUserPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); * TorqueGroupPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); * TorqueRolePeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); * TorquePermissionPeer.doDelete(criteria); * } * catch (TorqueException e) Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java?rev=1500631&r1=1500630&r2=1500631&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java Mon Jul 8 09:33:50 2013 @@ -61,35 +61,35 @@ public class TorqueUserManagerTest exten * try * { * Criteria criteria = new Criteria(); - * criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicUserGroupPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicGroupRolePeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicRolePermissionPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); * TorqueDynamicUserDelegatesPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN); * TorqueUserPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); * TorqueGroupPeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); * TorqueRolePeer.doDelete(criteria); * * criteria.clear(); - * criteria.add(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); + * criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); * TorquePermissionPeer.doDelete(criteria); * } * catch (TorqueException e) Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java?rev=1500631&r1=1500630&r2=1500631&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java Mon Jul 8 09:33:50 2013 @@ -23,12 +23,12 @@ import org.apache.fulcrum.security.Secur import org.apache.fulcrum.security.entity.User; import org.apache.fulcrum.security.model.basic.entity.BasicUser; import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest; +import org.apache.fulcrum.security.torque.HsqlDB; import org.apache.fulcrum.security.torque.om.TorqueBasicGroupPeer; import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer; import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer; -import org.apache.fulcrum.security.torque.HsqlDB; import org.apache.torque.TorqueException; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -67,16 +67,16 @@ public class TorqueBasicModelManagerTest try { Criteria criteria = new Criteria(); - criteria.add(TorqueBasicUserGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); - criteria.add(TorqueBasicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); + criteria.where(TorqueBasicUserGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + criteria.where(TorqueBasicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); TorqueBasicUserGroupPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueBasicUserPeer.USER_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueBasicUserPeer.USER_ID, 0, Criteria.GREATER_THAN); TorqueBasicUserPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueBasicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueBasicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); TorqueBasicGroupPeer.doDelete(criteria); } catch (TorqueException e) Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java?rev=1500631&r1=1500630&r2=1500631&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java Mon Jul 8 09:33:50 2013 @@ -21,8 +21,8 @@ package org.apache.fulcrum.security.torq import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.dynamic.test.AbstractDynamicModelManagerTest; -import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupPeer; import org.apache.fulcrum.security.torque.HsqlDB; +import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupPeer; import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer; import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer; import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePeer; @@ -31,7 +31,7 @@ import org.apache.fulcrum.security.torqu import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer; import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer; import org.apache.torque.TorqueException; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -67,35 +67,35 @@ public class TorqueDynamicModelManagerTe try { Criteria criteria = new Criteria(); - criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); + criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN); TorqueDynamicUserGroupPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN); TorqueDynamicGroupRolePeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); TorqueDynamicRolePermissionPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN); TorqueDynamicUserDelegatesPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueDynamicUserPeer.USER_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueDynamicUserPeer.USER_ID, 0, Criteria.GREATER_THAN); TorqueDynamicUserPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueDynamicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueDynamicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); TorqueDynamicGroupPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueDynamicRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueDynamicRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); TorqueDynamicRolePeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueDynamicPermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueDynamicPermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); TorqueDynamicPermissionPeer.doDelete(criteria); } catch (TorqueException e) Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java?rev=1500631&r1=1500630&r2=1500631&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java Mon Jul 8 09:33:50 2013 @@ -20,15 +20,15 @@ package org.apache.fulcrum.security.torq import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest; +import org.apache.fulcrum.security.torque.HsqlDB; import org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeer; import org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer; import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeer; -import org.apache.fulcrum.security.torque.HsqlDB; import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer; import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer; import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer; import org.apache.torque.TorqueException; -import org.apache.torque.util.Criteria; +import org.apache.torque.criteria.Criteria; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -67,27 +67,27 @@ public class TorqueTurbineModelManagerTe try { Criteria criteria = new Criteria(); - criteria.add(TorqueTurbineUserGroupRolePeer.USER_ID, 0, Criteria.GREATER_THAN); + criteria.where(TorqueTurbineUserGroupRolePeer.USER_ID, 0, Criteria.GREATER_THAN); TorqueTurbineUserGroupRolePeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); TorqueTurbineRolePermissionPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN); TorqueTurbineUserPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); TorqueTurbineGroupPeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); TorqueTurbineRolePeer.doDelete(criteria); - criteria.clear(); - criteria.add(TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); + criteria = new Criteria(); + criteria.where(TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); TorqueTurbinePermissionPeer.doDelete(criteria); } catch (TorqueException e)
