You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/04/05 19:28:55 UTC
svn commit: r525904 [4/4] - in
/jakarta/turbine/fulcrum/trunk/security/torque: ./ schema/ src/java/
src/java/org/apache/ src/java/org/apache/fulcrum/security/torque/
src/java/org/apache/fulcrum/security/torque/basic/
src/java/org/apache/fulcrum/securit...
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java Thu Apr 5 10:28:53 2007
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import java.sql.Connection;
import java.util.Iterator;
import org.apache.fulcrum.security.entity.Group;
@@ -27,14 +28,11 @@
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.om.TorqueTurbineRolePermission;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
+import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.util.Transaction;
/**
* This implementation persists to a database via Torque.
*
@@ -54,28 +52,39 @@
public synchronized void grant(Role role, Permission permission)
throws DataBackendException, UnknownEntityException
{
- boolean roleExists = false;
- boolean permissionExists = false;
+ boolean roleExists = getRoleManager().checkExists(role);
+ boolean permissionExists = getPermissionManager().checkExists(permission);
- try
+ if (roleExists && permissionExists)
{
- roleExists = getRoleManager().checkExists(role);
- permissionExists = getPermissionManager().checkExists(permission);
+ ((TurbineRole)role).addPermission(permission);
+ ((TurbinePermission)permission).addRole(role);
- if (roleExists && permissionExists)
+ Connection con = null;
+
+ try
{
- ((TurbineRole) role).addPermission(permission);
- ((TurbinePermission) permission).addRole(role);
-
- TorqueTurbineRolePermission rp = new TorqueTurbineRolePermission();
- rp.setPermissionId((Integer)permission.getId());
- rp.setRoleId((Integer)role.getId());
- rp.save();
+ con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+
+ ((TorqueAbstractSecurityEntity)role).update(con);
+ ((TorqueAbstractSecurityEntity)permission).update(con);
+
+ Transaction.commit(con);
+ con = null;
}
- }
- catch (Exception e)
- {
- throw new DataBackendException("grant('" + role.getName() + "', '" + permission.getName() + "') failed", e);
+ catch (TorqueException e)
+ {
+ throw new DataBackendException("grant('" + role.getName() + "', '" + permission.getName() + "') failed", e);
+ }
+ finally
+ {
+ if (con != null)
+ {
+ Transaction.safeRollback(con);
+ }
+ }
+
+ return;
}
if (!roleExists)
@@ -100,28 +109,39 @@
public synchronized void revoke(Role role, Permission permission)
throws DataBackendException, UnknownEntityException
{
- boolean roleExists = false;
- boolean permissionExists = false;
+ boolean roleExists = getRoleManager().checkExists(role);
+ boolean permissionExists = getPermissionManager().checkExists(permission);
- try
+ if (roleExists && permissionExists)
{
- roleExists = getRoleManager().checkExists(role);
- permissionExists = getPermissionManager().checkExists(permission);
+ ((TurbineRole)role).removePermission(permission);
+ ((TurbinePermission)permission).removeRole(role);
- if (roleExists && permissionExists)
+ Connection con = null;
+
+ try
{
- ((TurbineRole) role).removePermission(permission);
- ((TurbinePermission) permission).removeRole(role);
-
- Criteria criteria = new Criteria();
- criteria.add(TorqueTurbineRolePermissionPeer.ROLE_ID, (Integer)role.getId());
- criteria.add(TorqueTurbineRolePermissionPeer.PERMISSION_ID, (Integer)permission.getId());
- TorqueTurbineRolePermissionPeer.doDelete(criteria);
+ con = Transaction.begin(((TorqueAbstractSecurityEntity)role).getDatabaseName());
+
+ ((TorqueAbstractSecurityEntity)role).update(con);
+ ((TorqueAbstractSecurityEntity)permission).update(con);
+
+ Transaction.commit(con);
+ con = null;
}
- }
- catch (TorqueException e)
- {
- throw new DataBackendException("revoke('" + role.getName() + "', '" + permission.getName() + "') failed", e);
+ catch (TorqueException e)
+ {
+ throw new DataBackendException("revoke('" + role.getName() + "', '" + permission.getName() + "') failed", e);
+ }
+ finally
+ {
+ if (con != null)
+ {
+ Transaction.safeRollback(con);
+ }
+ }
+
+ return;
}
if (!roleExists)
@@ -137,38 +157,49 @@
public synchronized void grant(User user, Group group, Role role) throws DataBackendException, UnknownEntityException
{
- boolean roleExists = false;
- boolean userExists = false;
- boolean groupExists = false;
+ boolean roleExists = getRoleManager().checkExists(role);
+ boolean userExists = getUserManager().checkExists(user);
+ boolean groupExists = getGroupManager().checkExists(group);
- try
+ if (roleExists && groupExists && userExists)
{
- roleExists = getRoleManager().checkExists(role);
- userExists = getUserManager().checkExists(user);
- groupExists = getGroupManager().checkExists(group);
- if (roleExists && groupExists && userExists)
- {
- TurbineUserGroupRole user_group_role = new TurbineUserGroupRole();
- user_group_role.setUser(user);
- user_group_role.setGroup(group);
- user_group_role.setRole(role);
- ((TurbineUser) user).addUserGroupRole(user_group_role);
- ((TurbineGroup) group).addUserGroupRole(user_group_role);
- ((TurbineRole) role).addUserGroupRole(user_group_role);
-
- TorqueTurbineUserGroupRole ugr = new TorqueTurbineUserGroupRole();
- ugr.setUserId((Integer)user.getId());
- ugr.setGroupId((Integer)group.getId());
- ugr.setRoleId((Integer)role.getId());
- ugr.save();
- }
- }
- catch (Exception e)
- {
- throw new DataBackendException("grant('"
- + (user != null ? user.getName() : "null") + "', '"
- + (group != null ? group.getName() : "null") + "', '"
- + (role != null ? role.getName() : "null") + "') failed", e);
+ TurbineUserGroupRole user_group_role = new TurbineUserGroupRole();
+ user_group_role.setUser(user);
+ user_group_role.setGroup(group);
+ user_group_role.setRole(role);
+ ((TurbineUser) user).addUserGroupRole(user_group_role);
+ ((TurbineGroup) group).addUserGroupRole(user_group_role);
+ ((TurbineRole) role).addUserGroupRole(user_group_role);
+
+ Connection con = null;
+
+ try
+ {
+ con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+
+ ((TorqueAbstractSecurityEntity)user).update(con);
+ ((TorqueAbstractSecurityEntity)group).update(con);
+ ((TorqueAbstractSecurityEntity)role).update(con);
+
+ Transaction.commit(con);
+ con = null;
+ }
+ catch (TorqueException e)
+ {
+ throw new DataBackendException("grant('"
+ + (user != null ? user.getName() : "null") + "', '"
+ + (group != null ? group.getName() : "null") + "', '"
+ + (role != null ? role.getName() : "null") + "') failed", e);
+ }
+ finally
+ {
+ if (con != null)
+ {
+ Transaction.safeRollback(con);
+ }
+ }
+
+ return;
}
if (!roleExists)
@@ -190,55 +221,66 @@
public synchronized void revoke(User user, Group group, Role role)
throws DataBackendException, UnknownEntityException
{
- boolean roleExists = false;
- boolean userExists = false;
- boolean groupExists = false;
- try
- {
- roleExists = getRoleManager().checkExists(role);
- userExists = getUserManager().checkExists(user);
- groupExists = getGroupManager().checkExists(group);
+ boolean roleExists = getRoleManager().checkExists(role);
+ boolean userExists = getUserManager().checkExists(user);
+ boolean groupExists = getGroupManager().checkExists(group);
- if (roleExists && groupExists && userExists)
- {
- boolean ugrFound = false;
- TurbineUserGroupRole user_group_role = null;
+ if (roleExists && groupExists && userExists)
+ {
+ boolean ugrFound = false;
+ TurbineUserGroupRole user_group_role = null;
- for (Iterator i = ((TurbineUser) user).getUserGroupRoleSet()
- .iterator(); i.hasNext();)
+ for (Iterator i = ((TurbineUser) user).getUserGroupRoleSet()
+ .iterator(); i.hasNext();)
+ {
+ user_group_role = (TurbineUserGroupRole) i.next();
+ if (user_group_role.getUser().equals(user)
+ && user_group_role.getGroup().equals(group)
+ && user_group_role.getRole().equals(role))
{
- user_group_role = (TurbineUserGroupRole) i.next();
- if (user_group_role.getUser().equals(user)
- && user_group_role.getGroup().equals(group)
- && user_group_role.getRole().equals(role))
- {
- ugrFound = true;
- break;
- }
+ ugrFound = true;
+ break;
}
+ }
- if (!ugrFound)
+ if (!ugrFound)
+ {
+ throw new UnknownEntityException("Could not find User/Group/Role");
+ }
+
+ ((TurbineUser)user).removeUserGroupRole(user_group_role);
+ ((TurbineGroup)group).removeUserGroupRole(user_group_role);
+ ((TurbineRole)role).removeUserGroupRole(user_group_role);
+
+ Connection con = null;
+
+ try
+ {
+ con = Transaction.begin(((TorqueAbstractSecurityEntity)user).getDatabaseName());
+
+ ((TorqueAbstractSecurityEntity)user).update(con);
+ ((TorqueAbstractSecurityEntity)group).update(con);
+ ((TorqueAbstractSecurityEntity)role).update(con);
+
+ Transaction.commit(con);
+ con = null;
+ }
+ catch (TorqueException e)
+ {
+ throw new DataBackendException("revoke('"
+ + (user != null ? user.getName() : "null") + "', '"
+ + (group != null ? group.getName() : "null") + "', '"
+ + (role != null ? role.getName() : "null") + "') failed", e);
+ }
+ finally
+ {
+ if (con != null)
{
- throw new UnknownEntityException("Could not find User/Group/Role");
+ Transaction.safeRollback(con);
}
-
- ((TurbineUser) user).removeUserGroupRole(user_group_role);
- ((TurbineGroup) group).removeUserGroupRole(user_group_role);
- ((TurbineRole) role).removeUserGroupRole(user_group_role);
-
- Criteria criteria = new Criteria();
- criteria.add(TorqueTurbineUserGroupRolePeer.USER_ID, (Integer)user.getId());
- criteria.add(TorqueTurbineUserGroupRolePeer.GROUP_ID, (Integer)group.getId());
- criteria.add(TorqueTurbineUserGroupRolePeer.ROLE_ID, (Integer)role.getId());
- TorqueTurbineUserGroupRolePeer.doDelete(criteria);
- }
- }
- catch (Exception e)
- {
- throw new DataBackendException("revoke('"
- + (user != null ? user.getName() : "null") + "', '"
- + (group != null ? group.getName() : "null") + "', '"
- + (role != null ? role.getName() : "null") + "') failed", e);
+ }
+
+ return;
}
if (!roleExists)
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java Thu Apr 5 10:28:53 2007
@@ -15,19 +15,13 @@
* limitations under the License.
*/
import java.sql.Connection;
-import java.util.Iterator;
import java.util.List;
-import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.entity.Permission;
-import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.model.turbine.entity.TurbinePermission;
import org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager;
-import org.apache.fulcrum.security.torque.om.TorqueRole;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
-import org.apache.fulcrum.security.util.DataBackendException;
-import org.apache.fulcrum.security.util.RoleSet;
+import org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer;
+import org.apache.torque.NoRowsException;
+import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
/**
@@ -39,33 +33,40 @@
public class TorqueTurbinePermissionManagerImpl extends TorqueAbstractPermissionManager
{
/**
- * Provides the roles for the given permission
- *
- * @param permission the permission for which the roles should be retrieved
- * @param con a database connection
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectAllPermissions(java.sql.Connection)
*/
- protected void attachObjectsForPermission(Permission permission, Connection con)
- throws TorqueException, DataBackendException
+ protected List doSelectAllPermissions(Connection con) throws TorqueException
{
- RoleSet roleSet = new RoleSet();
+ Criteria criteria = new Criteria(TorqueTurbinePermissionPeer.DATABASE_NAME);
- Criteria criteria = new Criteria();
- criteria.addJoin(TorqueTurbineRolePermissionPeer.ROLE_ID, TorqueRolePeer.ROLE_ID);
- criteria.add(TorqueTurbineRolePermissionPeer.PERMISSION_ID, (Integer)permission.getId());
-
- List roles = TorqueRolePeer.doSelect(criteria, con);
- RoleManager roleManager = getRoleManager();
+ return TorqueTurbinePermissionPeer.doSelect(criteria, con);
+ }
+
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectById(java.lang.Integer, java.sql.Connection)
+ */
+ protected Permission doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ {
+ return TorqueTurbinePermissionPeer.retrieveByPK(id, con);
+ }
+
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractPermissionManager#doSelectByName(java.lang.String, java.sql.Connection)
+ */
+ protected Permission doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ {
+ Criteria criteria = new Criteria(TorqueTurbinePermissionPeer.DATABASE_NAME);
+ criteria.add(TorqueTurbinePermissionPeer.PERMISSION_NAME, name);
+ criteria.setIgnoreCase(true);
+ criteria.setSingleRecord(true);
- for (Iterator i = roles.iterator(); i.hasNext();)
+ List permissions = TorqueTurbinePermissionPeer.doSelect(criteria, con);
+
+ if (permissions.isEmpty())
{
- TorqueRole r = (TorqueRole)i.next();
- Role role = roleManager.getRoleInstance();
-
- role.setId(r.getId());
- role.setName(r.getName());
- roleSet.add(role);
+ throw new NoRowsException(name);
}
- ((TurbinePermission)permission).setRoles(roleSet);
+ return (Permission)permissions.get(0);
}
}
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java Thu Apr 5 10:28:53 2007
@@ -15,33 +15,13 @@
* limitations under the License.
*/
import java.sql.Connection;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.Set;
-import org.apache.fulcrum.security.GroupManager;
-import org.apache.fulcrum.security.PermissionManager;
-import org.apache.fulcrum.security.UserManager;
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.entity.User;
-import org.apache.fulcrum.security.model.turbine.entity.TurbineRole;
-import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.fulcrum.security.torque.TorqueAbstractRoleManager;
-import org.apache.fulcrum.security.torque.om.TorqueGroup;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorquePermission;
-import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueUser;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
-import org.apache.fulcrum.security.util.DataBackendException;
-import org.apache.fulcrum.security.util.PermissionSet;
-import org.apache.fulcrum.security.util.UnknownEntityException;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeer;
+import org.apache.torque.NoRowsException;
+import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
/**
@@ -53,67 +33,40 @@
public class TorqueTurbineRoleManagerImpl extends TorqueAbstractRoleManager
{
/**
- * Provides the user/group/role-relations for the given role
- *
- * @param role the role for which the relations should be retrieved
- * @param con a database connection
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectAllRoles(java.sql.Connection)
*/
- protected void attachObjectsForRole(Role role, Connection con)
- throws TorqueException, DataBackendException, UnknownEntityException
+ protected List doSelectAllRoles(Connection con) throws TorqueException
{
- Set ugrSet = new HashSet();
-
- Criteria criteria = new Criteria();
- criteria.add(TorqueTurbineUserGroupRolePeer.ROLE_ID, (Integer)role.getId());
-
- List ugrs = TorqueTurbineUserGroupRolePeer.doSelect(criteria, con);
- UserManager userManager = getUserManager();
- GroupManager groupManager = getGroupManager();
-
- for (Iterator i = ugrs.iterator(); i.hasNext();)
- {
- TurbineUserGroupRole ugr = new TurbineUserGroupRole();
- ugr.setRole(role);
-
- TorqueTurbineUserGroupRole tugr = (TorqueTurbineUserGroupRole)i.next();
+ Criteria criteria = new Criteria(TorqueTurbineRolePeer.DATABASE_NAME);
- User user = userManager.getUserInstance();
- TorqueUser u = TorqueUserPeer.retrieveByPK(tugr.getUserId(), con);
- user.setId(u.getId());
- user.setName(u.getName());
- user.setPassword(u.getPassword());
- ugr.setUser(user);
+ return TorqueTurbineRolePeer.doSelect(criteria, con);
+ }
- Group group = groupManager.getGroupInstance();
- TorqueGroup g = TorqueGroupPeer.retrieveByPK(tugr.getGroupId(), con);
- group.setId(g.getId());
- group.setName(g.getName());
- ugr.setGroup(group);
-
- ugrSet.add(ugr);
- }
-
- ((TurbineRole)role).setUserGroupRoleSet(ugrSet);
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectById(java.lang.Integer, java.sql.Connection)
+ */
+ protected Role doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ {
+ return TorqueTurbineRolePeer.retrieveByPK(id, con);
+ }
- PermissionSet permissionSet = new PermissionSet();
-
- criteria.clear();
- criteria.addJoin(TorqueTurbineRolePermissionPeer.PERMISSION_ID, TorquePermissionPeer.PERMISSION_ID);
- criteria.add(TorqueTurbineRolePermissionPeer.ROLE_ID, (Integer)role.getId());
-
- List permissions = TorquePermissionPeer.doSelect(criteria, con);
- PermissionManager permissionManager = getPermissionManager();
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractRoleManager#doSelectByName(java.lang.String, java.sql.Connection)
+ */
+ protected Role doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ {
+ Criteria criteria = new Criteria(TorqueTurbineRolePeer.DATABASE_NAME);
+ criteria.add(TorqueTurbineRolePeer.ROLE_NAME, name);
+ criteria.setIgnoreCase(true);
+ criteria.setSingleRecord(true);
+
+ List roles = TorqueTurbineRolePeer.doSelect(criteria, con);
- for (Iterator i = permissions.iterator(); i.hasNext();)
+ if (roles.isEmpty())
{
- TorquePermission p = (TorquePermission)i.next();
- Permission permission = permissionManager.getPermissionInstance();
-
- permission.setId(p.getId());
- permission.setName(p.getName());
- permissionSet.add(permission);
+ throw new NoRowsException(name);
}
- ((TurbineRole)role).setPermissions(permissionSet);
+ return (Role)roles.get(0);
}
}
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java Thu Apr 5 10:28:53 2007
@@ -15,26 +15,13 @@
* limitations under the License.
*/
import java.sql.Connection;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.Set;
-import org.apache.fulcrum.security.GroupManager;
-import org.apache.fulcrum.security.RoleManager;
-import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.entity.User;
-import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
-import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.fulcrum.security.torque.TorqueAbstractUserManager;
-import org.apache.fulcrum.security.torque.om.TorqueGroup;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueRole;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
-import org.apache.fulcrum.security.util.DataBackendException;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer;
+import org.apache.torque.NoRowsException;
+import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
/**
@@ -46,45 +33,40 @@
public class TorqueTurbineUserManagerImpl extends TorqueAbstractUserManager
{
/**
- * Provides the user/group/role-relations for the given user
- *
- * @param user the user for which the relations should be retrieved
- * @param con a database connection
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectAllUsers(java.sql.Connection)
*/
- protected void attachObjectsForUser(User user, Connection con)
- throws TorqueException, DataBackendException
+ protected List doSelectAllUsers(Connection con) throws TorqueException
{
- Set ugrSet = new HashSet();
-
- Criteria criteria = new Criteria();
- criteria.add(TorqueTurbineUserGroupRolePeer.USER_ID, (Integer)user.getId());
-
- List ugrs = TorqueTurbineUserGroupRolePeer.doSelect(criteria, con);
- RoleManager userManager = getRoleManager();
- GroupManager groupManager = getGroupManager();
-
- for (Iterator i = ugrs.iterator(); i.hasNext();)
- {
- TurbineUserGroupRole ugr = new TurbineUserGroupRole();
- ugr.setUser(user);
-
- TorqueTurbineUserGroupRole tugr = (TorqueTurbineUserGroupRole)i.next();
+ Criteria criteria = new Criteria(TorqueTurbineUserPeer.DATABASE_NAME);
+
+ return TorqueTurbineUserPeer.doSelect(criteria, con);
+ }
+
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectById(java.lang.Integer, java.sql.Connection)
+ */
+ protected User doSelectById(Integer id, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ {
+ return TorqueTurbineUserPeer.retrieveByPK(id, con);
+ }
- Role role = userManager.getRoleInstance();
- TorqueRole r = TorqueRolePeer.retrieveByPK(tugr.getRoleId(), con);
- role.setId(r.getId());
- role.setName(r.getName());
- ugr.setRole(role);
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectByName(java.lang.String, java.sql.Connection)
+ */
+ protected User doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
+ {
+ Criteria criteria = new Criteria(TorqueTurbineUserPeer.DATABASE_NAME);
+ criteria.add(TorqueTurbineUserPeer.LOGIN_NAME, name);
+ criteria.setIgnoreCase(true);
+ criteria.setSingleRecord(true);
- Group group = groupManager.getGroupInstance();
- TorqueGroup g = TorqueGroupPeer.retrieveByPK(tugr.getGroupId(), con);
- group.setId(g.getId());
- group.setName(g.getName());
- ugr.setGroup(group);
-
- ugrSet.add(ugr);
+ List users = TorqueTurbineUserPeer.doSelect(criteria, con);
+
+ if (users.isEmpty())
+ {
+ throw new NoRowsException(name);
}
- ((TurbineUser)user).setUserGroupRoleSet(ugrSet);
+ return (User)users.get(0);
}
}
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueComponentConfig.xml?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueComponentConfig.xml Thu Apr 5 10:28:53 2007
@@ -5,10 +5,10 @@
<aclFactory/>
<userManager>
- <className>org.apache.fulcrum.security.model.basic.entity.BasicUser</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueBasicUser</className>
</userManager>
<groupManager>
- <className>org.apache.fulcrum.security.model.basic.entity.BasicGroup</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueBasicGroup</className>
</groupManager>
<torqueService>
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueRoleConfig.xml?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/BasicTorqueRoleConfig.xml Thu Apr 5 10:28:53 2007
@@ -1,6 +1,11 @@
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
+ name="org.apache.torque.avalon.Torque"
+ shorthand="torqueService"
+ default-class="org.apache.torque.avalon.TorqueComponent"
+ early-init="true" />
+ <role
name="org.apache.fulcrum.security.SecurityService"
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService"/>
@@ -25,9 +30,5 @@
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="aclFactory"
default-class="org.apache.fulcrum.security.model.basic.BasicACLFactory"/>
- <role
- name="org.apache.torque.avalon.Torque"
- shorthand="torqueService"
- default-class="org.apache.torque.avalon.TorqueComponent"/>
</role-list>
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueComponentConfig.xml?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueComponentConfig.xml Thu Apr 5 10:28:53 2007
@@ -5,16 +5,16 @@
<aclFactory/>
<userManager>
- <className>org.apache.fulcrum.security.model.dynamic.entity.DynamicUser</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueDynamicUser</className>
</userManager>
<groupManager>
- <className>org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueDynamicGroup</className>
</groupManager>
<roleManager>
- <className>org.apache.fulcrum.security.model.dynamic.entity.DynamicRole</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueDynamicRole</className>
</roleManager>
<permissionManager>
- <className>org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueDynamicPermission</className>
</permissionManager>
<torqueService>
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueRoleConfig.xml?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/DynamicTorqueRoleConfig.xml Thu Apr 5 10:28:53 2007
@@ -1,6 +1,11 @@
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
+ name="org.apache.torque.avalon.Torque"
+ shorthand="torqueService"
+ default-class="org.apache.torque.avalon.TorqueComponent"
+ early-init="true" />
+ <role
name="org.apache.fulcrum.security.SecurityService"
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService"/>
@@ -33,9 +38,5 @@
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="aclFactory"
default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
- <role
- name="org.apache.torque.avalon.Torque"
- shorthand="torqueService"
- default-class="org.apache.torque.avalon.TorqueComponent"/>
</role-list>
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties Thu Apr 5 10:28:53 2007
@@ -27,8 +27,7 @@
torque.dsfactory.fulcrum.connection.url = jdbc:hsqldb:.
torque.dsfactory.fulcrum.connection.user = sa
torque.dsfactory.fulcrum.connection.password =
-
-torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
+#torque.dsfactory.fulcrum.pool.validationQuery = SELECT 1
# Determines whether the managers cache instances of the business objects.
# And also whether the MethodResultCache will really cache results.
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueComponentConfig.xml?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueComponentConfig.xml Thu Apr 5 10:28:53 2007
@@ -5,16 +5,16 @@
<aclFactory/>
<userManager>
- <className>org.apache.fulcrum.security.model.turbine.entity.TurbineUser</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueTurbineUser</className>
</userManager>
<groupManager>
- <className>org.apache.fulcrum.security.model.turbine.entity.TurbineGroup</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueTurbineGroup</className>
</groupManager>
<roleManager>
- <className>org.apache.fulcrum.security.model.turbine.entity.TurbineRole</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueTurbineRole</className>
</roleManager>
<permissionManager>
- <className>org.apache.fulcrum.security.model.turbine.entity.TurbinePermission</className>
+ <className>org.apache.fulcrum.security.torque.om.TorqueTurbinePermission</className>
</permissionManager>
<torqueService>
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueRoleConfig.xml?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/TurbineTorqueRoleConfig.xml Thu Apr 5 10:28:53 2007
@@ -1,6 +1,11 @@
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
+ name="org.apache.torque.avalon.Torque"
+ shorthand="torqueService"
+ default-class="org.apache.torque.avalon.TorqueComponent"
+ early-init="true" />
+ <role
name="org.apache.fulcrum.security.SecurityService"
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService"/>
@@ -33,10 +38,5 @@
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="aclFactory"
default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
-
- <role
- name="org.apache.torque.avalon.Torque"
- shorthand="torqueService"
- default-class="org.apache.torque.avalon.TorqueComponent"/>
</role-list>
Added: jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema-idtable-init.sql
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema-idtable-init.sql?view=auto&rev=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema-idtable-init.sql (added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema-idtable-init.sql Thu Apr 5 10:28:53 2007
@@ -0,0 +1,3 @@
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (101, 'FULCRUM_BASIC_GROUP', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (102, 'FULCRUM_BASIC_USER', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (103, 'FULCRUM_BASIC_USER_GROUP', 1000, 10);
Added: jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema.sql
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema.sql?view=auto&rev=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema.sql (added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-basic-schema.sql Thu Apr 5 10:28:53 2007
@@ -0,0 +1,56 @@
+
+-----------------------------------------------------------------------------
+-- FULCRUM_BASIC_GROUP
+-----------------------------------------------------------------------------
+drop table FULCRUM_BASIC_GROUP if exists CASCADE;
+
+CREATE TABLE FULCRUM_BASIC_GROUP
+(
+ GROUP_ID INTEGER NOT NULL,
+ GROUP_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(GROUP_ID),
+ UNIQUE (GROUP_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_BASIC_USER
+-----------------------------------------------------------------------------
+drop table FULCRUM_BASIC_USER if exists CASCADE;
+
+CREATE TABLE FULCRUM_BASIC_USER
+(
+ USER_ID INTEGER NOT NULL,
+ LOGIN_NAME VARCHAR(64) NOT NULL,
+ PASSWORD_VALUE VARCHAR(16) NOT NULL,
+ PRIMARY KEY(USER_ID),
+ UNIQUE (LOGIN_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_BASIC_USER_GROUP
+-----------------------------------------------------------------------------
+drop table FULCRUM_BASIC_USER_GROUP if exists CASCADE;
+
+CREATE TABLE FULCRUM_BASIC_USER_GROUP
+(
+ USER_ID INTEGER NOT NULL,
+ GROUP_ID INTEGER NOT NULL,
+ PRIMARY KEY(USER_ID,GROUP_ID)
+);
+
+
+
+
+
+ ALTER TABLE FULCRUM_BASIC_USER_GROUP
+ ADD CONSTRAINT FULCRUM_BASIC_USER_GROUP_FK_1 FOREIGN KEY (USER_ID)
+ REFERENCES FULCRUM_BASIC_USER (USER_ID)
+;
+ ALTER TABLE FULCRUM_BASIC_USER_GROUP
+ ADD CONSTRAINT FULCRUM_BASIC_USER_GROUP_FK_2 FOREIGN KEY (GROUP_ID)
+ REFERENCES FULCRUM_BASIC_GROUP (GROUP_ID)
+;
+
+
Added: jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema-idtable-init.sql
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema-idtable-init.sql?view=auto&rev=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema-idtable-init.sql (added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema-idtable-init.sql Thu Apr 5 10:28:53 2007
@@ -0,0 +1,8 @@
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1101, 'FULCRUM_DYNAMIC_PERMISSION', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1102, 'FULCRUM_DYNAMIC_ROLE', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1103, 'FULCRUM_DYNAMIC_GROUP', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1104, 'FULCRUM_DYNAMIC_USER', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1105, 'DYNAMIC_ROLE_PERMISSION', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1106, 'DYNAMIC_USER_GROUP', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1107, 'DYNAMIC_GROUP_ROLE', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1108, 'DYNAMIC_USER_DELEGATES', 1000, 10);
Added: jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema.sql
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema.sql?view=auto&rev=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema.sql (added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-dynamic-schema.sql Thu Apr 5 10:28:53 2007
@@ -0,0 +1,157 @@
+
+-----------------------------------------------------------------------------
+-- FULCRUM_DYNAMIC_PERMISSION
+-----------------------------------------------------------------------------
+drop table FULCRUM_DYNAMIC_PERMISSION if exists CASCADE;
+
+CREATE TABLE FULCRUM_DYNAMIC_PERMISSION
+(
+ PERMISSION_ID INTEGER NOT NULL,
+ PERMISSION_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(PERMISSION_ID),
+ UNIQUE (PERMISSION_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_DYNAMIC_ROLE
+-----------------------------------------------------------------------------
+drop table FULCRUM_DYNAMIC_ROLE if exists CASCADE;
+
+CREATE TABLE FULCRUM_DYNAMIC_ROLE
+(
+ ROLE_ID INTEGER NOT NULL,
+ ROLE_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(ROLE_ID),
+ UNIQUE (ROLE_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_DYNAMIC_GROUP
+-----------------------------------------------------------------------------
+drop table FULCRUM_DYNAMIC_GROUP if exists CASCADE;
+
+CREATE TABLE FULCRUM_DYNAMIC_GROUP
+(
+ GROUP_ID INTEGER NOT NULL,
+ GROUP_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(GROUP_ID),
+ UNIQUE (GROUP_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_DYNAMIC_USER
+-----------------------------------------------------------------------------
+drop table FULCRUM_DYNAMIC_USER if exists CASCADE;
+
+CREATE TABLE FULCRUM_DYNAMIC_USER
+(
+ USER_ID INTEGER NOT NULL,
+ LOGIN_NAME VARCHAR(64) NOT NULL,
+ PASSWORD_VALUE VARCHAR(16) NOT NULL,
+ PRIMARY KEY(USER_ID),
+ UNIQUE (LOGIN_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_ROLE_PERMISSION
+-----------------------------------------------------------------------------
+drop table DYNAMIC_ROLE_PERMISSION if exists CASCADE;
+
+CREATE TABLE DYNAMIC_ROLE_PERMISSION
+(
+ ROLE_ID INTEGER NOT NULL,
+ PERMISSION_ID INTEGER NOT NULL,
+ PRIMARY KEY(ROLE_ID,PERMISSION_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_USER_GROUP
+-----------------------------------------------------------------------------
+drop table DYNAMIC_USER_GROUP if exists CASCADE;
+
+CREATE TABLE DYNAMIC_USER_GROUP
+(
+ USER_ID INTEGER NOT NULL,
+ GROUP_ID INTEGER NOT NULL,
+ PRIMARY KEY(USER_ID,GROUP_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_GROUP_ROLE
+-----------------------------------------------------------------------------
+drop table DYNAMIC_GROUP_ROLE if exists CASCADE;
+
+CREATE TABLE DYNAMIC_GROUP_ROLE
+(
+ GROUP_ID INTEGER NOT NULL,
+ ROLE_ID INTEGER NOT NULL,
+ PRIMARY KEY(GROUP_ID,ROLE_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_USER_DELEGATES
+-----------------------------------------------------------------------------
+drop table DYNAMIC_USER_DELEGATES if exists CASCADE;
+
+CREATE TABLE DYNAMIC_USER_DELEGATES
+(
+ DELEGATOR_USER_ID INTEGER NOT NULL,
+ DELEGATEE_USER_ID INTEGER NOT NULL,
+ PRIMARY KEY(DELEGATOR_USER_ID,DELEGATEE_USER_ID)
+);
+
+
+
+
+
+
+
+
+
+ ALTER TABLE DYNAMIC_ROLE_PERMISSION
+ ADD CONSTRAINT DYNAMIC_ROLE_PERMISSION_FK_1 FOREIGN KEY (ROLE_ID)
+ REFERENCES FULCRUM_DYNAMIC_ROLE (ROLE_ID)
+;
+ ALTER TABLE DYNAMIC_ROLE_PERMISSION
+ ADD CONSTRAINT DYNAMIC_ROLE_PERMISSION_FK_2 FOREIGN KEY (PERMISSION_ID)
+ REFERENCES FULCRUM_DYNAMIC_PERMISSION (PERMISSION_ID)
+;
+
+
+ ALTER TABLE DYNAMIC_USER_GROUP
+ ADD CONSTRAINT DYNAMIC_USER_GROUP_FK_1 FOREIGN KEY (USER_ID)
+ REFERENCES FULCRUM_DYNAMIC_USER (USER_ID)
+;
+ ALTER TABLE DYNAMIC_USER_GROUP
+ ADD CONSTRAINT DYNAMIC_USER_GROUP_FK_2 FOREIGN KEY (GROUP_ID)
+ REFERENCES FULCRUM_DYNAMIC_GROUP (GROUP_ID)
+;
+
+
+ ALTER TABLE DYNAMIC_GROUP_ROLE
+ ADD CONSTRAINT DYNAMIC_GROUP_ROLE_FK_1 FOREIGN KEY (GROUP_ID)
+ REFERENCES FULCRUM_DYNAMIC_GROUP (GROUP_ID)
+;
+ ALTER TABLE DYNAMIC_GROUP_ROLE
+ ADD CONSTRAINT DYNAMIC_GROUP_ROLE_FK_2 FOREIGN KEY (ROLE_ID)
+ REFERENCES FULCRUM_DYNAMIC_ROLE (ROLE_ID)
+;
+
+
+ ALTER TABLE DYNAMIC_USER_DELEGATES
+ ADD CONSTRAINT DYNAMIC_USER_DELEGATES_FK_1 FOREIGN KEY (DELEGATOR_USER_ID)
+ REFERENCES FULCRUM_DYNAMIC_USER (USER_ID)
+;
+ ALTER TABLE DYNAMIC_USER_DELEGATES
+ ADD CONSTRAINT DYNAMIC_USER_DELEGATES_FK_2 FOREIGN KEY (DELEGATEE_USER_ID)
+ REFERENCES FULCRUM_DYNAMIC_USER (USER_ID)
+;
+
+
Added: jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema-idtable-init.sql
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema-idtable-init.sql?view=auto&rev=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema-idtable-init.sql (added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema-idtable-init.sql Thu Apr 5 10:28:53 2007
@@ -0,0 +1,6 @@
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (2101, 'FULCRUM_TURBINE_PERMISSION', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (2102, 'FULCRUM_TURBINE_ROLE', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (2103, 'FULCRUM_TURBINE_GROUP', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (2104, 'FULCRUM_TURBINE_USER', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (2105, 'TURBINE_ROLE_PERMISSION', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (2106, 'TURBINE_USER_GROUP_ROLE', 1000, 10);
Added: jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql?view=auto&rev=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql (added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql Thu Apr 5 10:28:53 2007
@@ -0,0 +1,116 @@
+
+-----------------------------------------------------------------------------
+-- FULCRUM_TURBINE_PERMISSION
+-----------------------------------------------------------------------------
+drop table FULCRUM_TURBINE_PERMISSION if exists CASCADE;
+
+CREATE TABLE FULCRUM_TURBINE_PERMISSION
+(
+ PERMISSION_ID INTEGER NOT NULL,
+ PERMISSION_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(PERMISSION_ID),
+ UNIQUE (PERMISSION_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_TURBINE_ROLE
+-----------------------------------------------------------------------------
+drop table FULCRUM_TURBINE_ROLE if exists CASCADE;
+
+CREATE TABLE FULCRUM_TURBINE_ROLE
+(
+ ROLE_ID INTEGER NOT NULL,
+ ROLE_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(ROLE_ID),
+ UNIQUE (ROLE_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_TURBINE_GROUP
+-----------------------------------------------------------------------------
+drop table FULCRUM_TURBINE_GROUP if exists CASCADE;
+
+CREATE TABLE FULCRUM_TURBINE_GROUP
+(
+ GROUP_ID INTEGER NOT NULL,
+ GROUP_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(GROUP_ID),
+ UNIQUE (GROUP_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_TURBINE_USER
+-----------------------------------------------------------------------------
+drop table FULCRUM_TURBINE_USER if exists CASCADE;
+
+CREATE TABLE FULCRUM_TURBINE_USER
+(
+ USER_ID INTEGER NOT NULL,
+ LOGIN_NAME VARCHAR(64) NOT NULL,
+ PASSWORD_VALUE VARCHAR(16) NOT NULL,
+ 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 FULCRUM_TURBINE_ROLE (ROLE_ID)
+;
+ ALTER TABLE TURBINE_ROLE_PERMISSION
+ ADD CONSTRAINT TURBINE_ROLE_PERMISSION_FK_2 FOREIGN KEY (PERMISSION_ID)
+ REFERENCES FULCRUM_TURBINE_PERMISSION (PERMISSION_ID)
+;
+
+
+ ALTER TABLE TURBINE_USER_GROUP_ROLE
+ ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_1 FOREIGN KEY (USER_ID)
+ REFERENCES FULCRUM_TURBINE_USER (USER_ID)
+;
+ ALTER TABLE TURBINE_USER_GROUP_ROLE
+ ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_2 FOREIGN KEY (GROUP_ID)
+ REFERENCES FULCRUM_TURBINE_GROUP (GROUP_ID)
+;
+ ALTER TABLE TURBINE_USER_GROUP_ROLE
+ ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_3 FOREIGN KEY (ROLE_ID)
+ REFERENCES FULCRUM_TURBINE_ROLE (ROLE_ID)
+;
+
+
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql Thu Apr 5 10:28:53 2007
@@ -1,18 +1,18 @@
-
------------------------------------------------------------------------------
--- ID_TABLE
------------------------------------------------------------------------------
-drop table ID_TABLE if exists;
-
-CREATE TABLE ID_TABLE
-(
- ID_TABLE_ID INTEGER NOT NULL,
- TABLE_NAME VARCHAR(255) NOT NULL,
- NEXT_ID INTEGER,
- QUANTITY INTEGER,
- PRIMARY KEY(ID_TABLE_ID),
- UNIQUE (TABLE_NAME)
-);
-
-
-
+
+-----------------------------------------------------------------------------
+-- ID_TABLE
+-----------------------------------------------------------------------------
+drop table ID_TABLE if exists CASCADE;
+
+CREATE TABLE ID_TABLE
+(
+ ID_TABLE_ID INTEGER NOT NULL,
+ TABLE_NAME VARCHAR(255) NOT NULL,
+ NEXT_ID INTEGER,
+ QUANTITY INTEGER,
+ PRIMARY KEY(ID_TABLE_ID),
+ UNIQUE (TABLE_NAME)
+);
+
+
+
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java Thu Apr 5 10:28:53 2007
@@ -17,16 +17,6 @@
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
-import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -40,9 +30,13 @@
{
try
{
- this.hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-schema.sql");
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-basic-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema.sql");
hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-basic-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
@@ -57,7 +51,7 @@
public void tearDown()
{
- // cleanup tables
+/* // cleanup tables
try
{
Criteria criteria = new Criteria();
@@ -96,7 +90,7 @@
{
fail(e.toString());
}
-
+*/
group = null;
groupManager = null;
securityService = null;
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java Thu Apr 5 10:28:53 2007
@@ -17,16 +17,6 @@
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractPermissionManagerTest;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
-import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -39,9 +29,11 @@
public void setUp() throws Exception
{
- this.hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-schema.sql");
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-dynamic-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema.sql");
hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
@@ -52,6 +44,7 @@
public void tearDown()
{
+/*
// cleanup tables
try
{
@@ -91,7 +84,7 @@
{
fail(e.toString());
}
-
+*/
permission = null;
permissionManager = null;
securityService = null;
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java Thu Apr 5 10:28:53 2007
@@ -18,16 +18,6 @@
import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractRoleManagerTest;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
-import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -42,9 +32,12 @@
{
try
{
- this.hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-schema.sql");
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-dynamic-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema.sql");
hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
+
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
@@ -58,6 +51,7 @@
public void tearDown()
{
+/*
// cleanup tables
try
{
@@ -97,7 +91,7 @@
{
fail(e.toString());
}
-
+*/
role = null;
roleManager = null;
securityService = null;
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java Thu Apr 5 10:28:53 2007
@@ -17,16 +17,6 @@
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractUserManagerTest;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
-import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -42,9 +32,13 @@
{
try
{
- this.hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-schema.sql");
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-basic-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema.sql");
hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-basic-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
@@ -59,6 +53,7 @@
public void tearDown()
{
+/*
// cleanup tables
try
{
@@ -98,7 +93,7 @@
{
fail(e.toString());
}
-
+*/
user = null;
userManager = null;
securityService = null;
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java Thu Apr 5 10:28:53 2007
@@ -20,10 +20,10 @@
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.om.TorqueBasicGroupPeer;
import org.apache.fulcrum.security.torque.HsqlDB;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
+import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer;
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
@@ -40,9 +40,9 @@
{
if(hsqlDB == null)
{
- this.hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-schema.sql");
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-basic-schema.sql");
hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-basic-schema-idtable-init.sql");
}
this.setRoleFileName("src/test/BasicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/BasicTorqueComponentConfig.xml");
@@ -69,12 +69,12 @@
TorqueBasicUserGroupPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueUserPeer.doDelete(criteria);
-
+ criteria.add(TorqueBasicUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueBasicUserPeer.doDelete(criteria);
+
criteria.clear();
- criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueGroupPeer.doDelete(criteria);
+ criteria.add(TorqueBasicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ TorqueBasicGroupPeer.doDelete(criteria);
}
catch (TorqueException e)
{
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java Thu Apr 5 10:28:53 2007
@@ -18,15 +18,15 @@
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.TorqueDynamicGroupRolePeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer;
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
@@ -43,9 +43,9 @@
{
try
{
- this.hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-schema.sql");
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-dynamic-schema.sql");
hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema-idtable-init.sql");
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
@@ -80,20 +80,20 @@
TorqueDynamicUserDelegatesPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueUserPeer.doDelete(criteria);
-
+ criteria.add(TorqueDynamicUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicUserPeer.doDelete(criteria);
+
criteria.clear();
- criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueGroupPeer.doDelete(criteria);
+ criteria.add(TorqueDynamicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicGroupPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueRolePeer.doDelete(criteria);
-
+ criteria.add(TorqueDynamicRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicRolePeer.doDelete(criteria);
+
criteria.clear();
- criteria.add(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TorquePermissionPeer.doDelete(criteria);
+ criteria.add(TorqueDynamicPermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicPermissionPeer.doDelete(criteria);
}
catch (TorqueException e)
{
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java?view=diff&rev=525904&r1=525903&r2=525904
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java Thu Apr 5 10:28:53 2007
@@ -17,13 +17,13 @@
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest;
+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.TorqueGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer;
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
@@ -42,9 +42,9 @@
try
{
- this.hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-schema.sql");
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-turbine-schema.sql");
hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/TurbineTorqueComponentConfig.xml");
@@ -72,27 +72,27 @@
TorqueTurbineRolePermissionPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueUserPeer.doDelete(criteria);
+ criteria.add(TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineUserPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueGroupPeer.doDelete(criteria);
+ criteria.add(TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineGroupPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueRolePeer.doDelete(criteria);
+ criteria.add(TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineRolePeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TorquePermissionPeer.doDelete(criteria);
+ criteria.add(TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbinePermissionPeer.doDelete(criteria);
}
catch (TorqueException e)
{
fail(e.toString());
}
- modelManager = null;
+ modelManager = null;
securityService = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org