Copied: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java (from r1754909, turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java) URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java?p2=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java&p1=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java&r1=1754909&r2=1754910&rev=1754910&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java (original) +++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java Tue Aug 2 13:12:05 2016 @@ -27,6 +27,7 @@ import org.apache.fulcrum.security.model import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole; import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer; import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer; +import org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.apache.torque.om.SimpleKey; @@ -36,7 +37,7 @@ import org.apache.torque.om.SimpleKey; * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> * @version $Id:$ */ -public abstract class TorqueAbstractTurbineUser extends TorqueAbstractTurbineTurbineSecurityEntity +public abstract class FulcrumAbstractTurbineUser extends TorqueAbstractTurbineTurbineSecurityEntity implements TurbineUser { /** Serial version */ @@ -62,17 +63,19 @@ public abstract class TorqueAbstractTurb } /** - * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName() + * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName() */ - public String getDatabaseName() + @Override + public String getDatabaseName() { return TorqueTurbineUserPeer.DATABASE_NAME; } /** - * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection) + * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection) */ - public void retrieveAttachedObjects(Connection con) throws TorqueException + @Override + public void retrieveAttachedObjects(Connection con) throws TorqueException { Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>(); @@ -91,9 +94,10 @@ public abstract class TorqueAbstractTurb } /** - * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection) + * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection) */ - public void update(Connection con) throws TorqueException + @Override + public void update(Connection con) throws TorqueException { Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet(); if (userGroupRoleSet != null) @@ -125,9 +129,11 @@ public abstract class TorqueAbstractTurb } /** - * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete() + * @see org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete() */ - public void delete() throws TorqueException + + @Override + public void delete() throws TorqueException { TorqueTurbineUserPeer.doDelete(SimpleKey.keyFor(getEntityId())); }
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=1754910&r1=1754909&r2=1754910&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 Tue Aug 2 13:12:05 2016 @@ -120,6 +120,5 @@ public class TorqueTurbineGroupManagerIm return groups.get(0); } - } 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=1754910&r1=1754909&r2=1754910&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 Tue Aug 2 13:12:05 2016 @@ -30,7 +30,7 @@ import org.apache.fulcrum.security.model import org.apache.fulcrum.security.model.turbine.entity.TurbineRole; import org.apache.fulcrum.security.model.turbine.entity.TurbineUser; import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole; -import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity; +import org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity; import org.apache.fulcrum.security.util.DataBackendException; import org.apache.fulcrum.security.util.UnknownEntityException; import org.apache.torque.TorqueException; 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=1754910&r1=1754909&r2=1754910&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 Tue Aug 2 13:12:05 2016 @@ -123,5 +123,4 @@ public class TorqueTurbinePermissionMana return permissions.get(0); } - } 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=1754910&r1=1754909&r2=1754910&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 Tue Aug 2 13:12:05 2016 @@ -114,7 +114,6 @@ public class TorqueTurbineRoleManagerImp { throw new NoRowsException(name); } - return roles.get(0); } 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=1754910&r1=1754909&r2=1754910&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 Tue Aug 2 13:12:05 2016 @@ -162,7 +162,7 @@ public class TorqueTurbineUserManagerImp { throw new NoRowsException(name); } - + return users.get(0); } Added: turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties?rev=1754910&view=auto ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties (added) +++ turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties Tue Aug 2 13:12:05 2016 @@ -0,0 +1,38 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# +# Runtime settings for the fulcrum turbien default security test profile +# +# $Id: Torque.properties 279964 2005-09-10 07:07:23Z tfischer $ +# + +torque.database.default = default +torque.database.default.adapter = hsqldb + +# Using commons-dbcp +torque.dsfactory.default.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory +torque.dsfactory.default.connection.driver = org.hsqldb.jdbcDriver +torque.dsfactory.default.connection.url = jdbc:hsqldb:. +torque.dsfactory.default.connection.user = sa +torque.dsfactory.default.connection.password = +# torque.dsfactory.default.pool.validationQuery = SELECT 1 + +# Determines whether the managers cache instances of the business objects. +# And also whether the MethodResultCache will really cache results. + +torque.manager.useCache = true Propchange: turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties ------------------------------------------------------------------------------ svn:eol-style = native Added: turbine/fulcrum/trunk/security/torque/src/test/TurbineDefaultWithPeersComponentConfig.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/TurbineDefaultWithPeersComponentConfig.xml?rev=1754910&view=auto ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/TurbineDefaultWithPeersComponentConfig.xml (added) +++ turbine/fulcrum/trunk/security/torque/src/test/TurbineDefaultWithPeersComponentConfig.xml Tue Aug 2 13:12:05 2016 @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<my-system> + <securityService/> + <authenticator/> + <modelManager/> + <aclFactory/> + + <!-- have to use peers, as default is fulcrum --> + <userManager> + <className>org.apache.fulcrum.security.torque.om.TurbineUser</className> + <peerClassName>org.apache.fulcrum.security.torque.om.TurbineUserPeerImpl</peerClassName> + </userManager> + <groupManager> + <className>org.apache.fulcrum.security.torque.om.TurbineGroup</className> + <peerClassName>org.apache.fulcrum.security.torque.om.TurbineGroupPeerImpl</peerClassName> + </groupManager> + <roleManager> + <className>org.apache.fulcrum.security.torque.om.TurbineRole</className> + <peerClassName>org.apache.fulcrum.security.torque.om.TurbineRolePeerImpl</peerClassName> + </roleManager> + <permissionManager> + <className>org.apache.fulcrum.security.torque.om.TurbinePermission</className> + <peerClassName>org.apache.fulcrum.security.torque.om.TurbinePermissionPeerImpl</peerClassName> + </permissionManager> + + <torqueService> + <configfile>/src/test/TorqueDefault.properties</configfile> + </torqueService> +</my-system> Propchange: turbine/fulcrum/trunk/security/torque/src/test/TurbineDefaultWithPeersComponentConfig.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql?rev=1754910&view=auto ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql (added) +++ turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql Tue Aug 2 13:12:05 2016 @@ -0,0 +1,136 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. + +-- --------------------------------------------------------------------------- +-- FULCRUM_TURBINE_PERMISSION +-- --------------------------------------------------------------------------- +drop table TURBINE_PERMISSION if exists CASCADE; + +CREATE TABLE TURBINE_PERMISSION +( + PERMISSION_ID INTEGER IDENTITY NOT NULL, + PERMISSION_NAME VARCHAR(64) NOT NULL, + PRIMARY KEY(PERMISSION_ID), + UNIQUE (PERMISSION_NAME) +); + + +-- --------------------------------------------------------------------------- +-- TURBINE_ROLE +-- --------------------------------------------------------------------------- +drop table TURBINE_ROLE if exists CASCADE; + +CREATE TABLE TURBINE_ROLE +( + ROLE_ID INTEGER IDENTITY NOT NULL, + ROLE_NAME VARCHAR(64) NOT NULL, + PRIMARY KEY(ROLE_ID), + UNIQUE (ROLE_NAME) +); + + +-- --------------------------------------------------------------------------- +-- TURBINE_GROUP +-- --------------------------------------------------------------------------- +drop table TURBINE_GROUP if exists CASCADE; + +CREATE TABLE TURBINE_GROUP +( + GROUP_ID INTEGER IDENTITY NOT NULL, + GROUP_NAME VARCHAR(64) NOT NULL, + PRIMARY KEY(GROUP_ID), + UNIQUE (GROUP_NAME) +); + + +-- --------------------------------------------------------------------------- +-- TURBINE_USER +-- --------------------------------------------------------------------------- +drop table TURBINE_USER if exists CASCADE; + +CREATE TABLE TURBINE_USER +( + USER_ID INTEGER IDENTITY NOT NULL, + LOGIN_NAME VARCHAR(64) NOT NULL, + PASSWORD_VALUE VARCHAR(16) NOT NULL, + FIRST_NAME VARCHAR(64), + LAST_NAME VARCHAR(64), + EMAIL VARCHAR(64), + OBJECTDATA VARBINARY, + PRIMARY KEY(USER_ID), + UNIQUE (LOGIN_NAME) +); + + +-- --------------------------------------------------------------------------- +-- TURBINE_ROLE_PERMISSION +-- --------------------------------------------------------------------------- +drop table TURBINE_ROLE_PERMISSION if exists CASCADE; + +CREATE TABLE TURBINE_ROLE_PERMISSION +( + ROLE_ID INTEGER NOT NULL, + PERMISSION_ID INTEGER NOT NULL, + PRIMARY KEY(ROLE_ID,PERMISSION_ID) +); + + +-- --------------------------------------------------------------------------- +-- TURBINE_USER_GROUP_ROLE +-- --------------------------------------------------------------------------- +drop table TURBINE_USER_GROUP_ROLE if exists CASCADE; + +CREATE TABLE TURBINE_USER_GROUP_ROLE +( + USER_ID INTEGER NOT NULL, + GROUP_ID INTEGER NOT NULL, + ROLE_ID INTEGER NOT NULL, + PRIMARY KEY(USER_ID,GROUP_ID,ROLE_ID) +); + + + + + + + + + + ALTER TABLE TURBINE_ROLE_PERMISSION + ADD CONSTRAINT TURBINE_ROLE_PERMISSION_FK_1 FOREIGN KEY (ROLE_ID) + REFERENCES TURBINE_ROLE (ROLE_ID) +; + ALTER TABLE TURBINE_ROLE_PERMISSION + ADD CONSTRAINT TURBINE_ROLE_PERMISSION_FK_2 FOREIGN KEY (PERMISSION_ID) + REFERENCES TURBINE_PERMISSION (PERMISSION_ID) +; + + + ALTER TABLE TURBINE_USER_GROUP_ROLE + ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_1 FOREIGN KEY (USER_ID) + REFERENCES TURBINE_USER (USER_ID) +; + ALTER TABLE TURBINE_USER_GROUP_ROLE + ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_2 FOREIGN KEY (GROUP_ID) + REFERENCES TURBINE_GROUP (GROUP_ID) +; + ALTER TABLE TURBINE_USER_GROUP_ROLE + ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_3 FOREIGN KEY (ROLE_ID) + REFERENCES TURBINE_ROLE (ROLE_ID) +; + + Propchange: turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql ------------------------------------------------------------------------------ svn:eol-style = native 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=1754910&r1=1754909&r2=1754910&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 Tue Aug 2 13:12:05 2016 @@ -40,7 +40,8 @@ public class TorqueTurbineModelManagerTe { protected static HsqlDB hsqlDB = null; - public void setUp() throws Exception + @Override + public void setUp() throws Exception { try @@ -60,8 +61,10 @@ public class TorqueTurbineModelManagerTe } } + - public void tearDown() + @Override + public void tearDown() { // cleanup tables try Added: 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=1754910&view=auto ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java (added) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java Tue Aug 2 13:12:05 2016 @@ -0,0 +1,113 @@ +package org.apache.fulcrum.security.torque.turbine; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +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.TurbineGroupPeer; +import org.apache.fulcrum.security.torque.om.TurbinePermissionPeer; +import org.apache.fulcrum.security.torque.om.TurbineRolePeer; +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.torque.TorqueException; +import org.apache.torque.criteria.Criteria; + +/** + * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> + * @author <a href="[email protected]">Jürgen Hoffmann</a> + * @version $Id:$ + */ +public class TurbineDefaultModelManagerTest + extends AbstractTurbineModelManagerTest +{ + protected static HsqlDB hsqlDB = null; + + @Override + public void setUp() throws Exception + { + + try + { + hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-turbine-default-schema.sql"); + // we do not need id-broker,set native in schema and added identity in hsql + // same for both flavors + this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml"); + // we have to use declared peers + this.setConfigurationFileName("src/test/TurbineDefaultWithPeersComponentConfig.xml"); + securityService = (SecurityService) lookup(SecurityService.ROLE); + super.setUp(); + } + catch (Exception e) + { + fail(e.toString()); + } + + } + + + @Override + public void tearDown() + { + // cleanup tables + try + { + Criteria criteria = new Criteria(); + criteria.where(TurbineUserGroupRolePeer.USER_ID, 0, Criteria.GREATER_THAN); + TurbineUserGroupRolePeer.doDelete(criteria); + + criteria = new Criteria(); + criteria.where(TurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN); + TurbineRolePermissionPeer.doDelete(criteria); + + criteria = new Criteria(); + criteria.where(TurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN); + TurbineUserPeer.doDelete(criteria); + + criteria = new Criteria(); + criteria.where(TurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN); + TurbineGroupPeer.doDelete(criteria); + + criteria = new Criteria(); + criteria.where(TurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN); + TurbineRolePeer.doDelete(criteria); + + criteria = new Criteria(); + criteria.where(TurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN); + TurbinePermissionPeer.doDelete(criteria); + } + catch (TorqueException e) + { + fail(e.toString()); + } + + modelManager = null; + securityService = null; + } + + /** + * Constructor for TurbineDefaultModelManagerTest. + * @param arg0 + */ + public TurbineDefaultModelManagerTest(String arg0) + { + super(arg0); + } +} Propchange: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java ------------------------------------------------------------------------------ svn:eol-style = native
