Index: TurbineGroupManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java,v
retrieving revision 1.8
diff -u -r1.8 TurbineGroupManagement.java
--- TurbineGroupManagement.java	9 Jun 2003 22:06:57 -0000	1.8
+++ TurbineGroupManagement.java	7 Jul 2003 16:32:52 -0000
@@ -54,6 +54,7 @@
 
 package org.apache.jetspeed.services.security.turbine;
 
+import java.math.BigDecimal;
 import java.sql.Connection;
 import java.util.Iterator;
 import java.util.List;
@@ -157,7 +158,7 @@
             throw new GroupException("Failed to Retrieve User: ", e);
         }
         Criteria criteria = new Criteria();
-        criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
+        criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
         List rels;
         HashMap groups;
 
@@ -370,7 +371,7 @@
             {
                 //CASCADE TURBINE_USER_GROUP_ROLE
                 Criteria criteria1 = new Criteria();
-                criteria1.add(TurbineUserGroupRolePeer.GROUP_ID, group.getId());
+                criteria1.add(TurbineUserGroupRolePeer.GROUP_ID, new BigDecimal(group.getId()));
                 TurbineUserGroupRolePeer.doDelete(criteria1, conn);
             }
 
@@ -427,9 +428,9 @@
             Role role = JetspeedSecurity.getRole(defaultRole);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
-            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, group.getId());
-            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, role.getId());
+            criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
+            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, new BigDecimal(group.getId()));
+            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, new BigDecimal(role.getId()));
             TurbineUserGroupRolePeer.doInsert(criteria);
         }
         catch(Exception e)
@@ -459,9 +460,9 @@
             Role role = JetspeedSecurity.getRole(defaultRole);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
-            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, group.getId());
-            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, role.getId());
+            criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
+            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, new BigDecimal(group.getId()));
+            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, new BigDecimal(role.getId()));
             TurbineUserGroupRolePeer.doDelete(criteria);
         }
         catch(Exception e)
@@ -493,8 +494,8 @@
             Group group = this.getGroup(groupname);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
-            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, group.getId());
+            criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
+            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, new BigDecimal(group.getId()));
             groups = TurbineUserGroupRolePeer.doSelect(criteria);
 
         }
Index: TurbinePermissionManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java,v
retrieving revision 1.8
diff -u -r1.8 TurbinePermissionManagement.java
--- TurbinePermissionManagement.java	9 Jun 2003 22:06:57 -0000	1.8
+++ TurbinePermissionManagement.java	7 Jul 2003 16:32:52 -0000
@@ -54,6 +54,7 @@
 
 package org.apache.jetspeed.services.security.turbine;
 
+import java.math.BigDecimal;
 import java.sql.Connection;
 import java.util.Iterator;
 import java.util.List;
@@ -157,7 +158,7 @@
             throw new PermissionException("Failed to Retrieve Role: ", e);
         }
         Criteria criteria = new Criteria();
-        criteria.add(TurbineRolePermissionPeer.ROLE_ID, role.getId());
+        criteria.add(TurbineRolePermissionPeer.ROLE_ID, new BigDecimal(role.getId()));
         List rels;
         HashMap perms;
 
@@ -319,11 +320,11 @@
             {
                 // CASCADE to TURBINE_ROLE_PERMISSION
                 Criteria critRolePerm = new Criteria();
-                critRolePerm.add(TurbineRolePermissionPeer.PERMISSION_ID, permission.getId());
+                critRolePerm.add(TurbineRolePermissionPeer.PERMISSION_ID, new BigDecimal(permission.getId()));
                 TurbineRolePermissionPeer.doDelete(critRolePerm, conn);
             }
             TurbinePermissionPeer.doDelete(criteria, conn);
-                
+
             conn.commit();
             
             if (cachingEnable)
@@ -379,8 +380,8 @@
             Permission permission = this.getPermission(permissionName);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineRolePermissionPeer.ROLE_ID, role.getId());
-            criteria.add(TurbineRolePermissionPeer.PERMISSION_ID, permission.getId());
+            criteria.add(TurbineRolePermissionPeer.ROLE_ID, new BigDecimal(role.getId()));
+            criteria.add(TurbineRolePermissionPeer.PERMISSION_ID, new BigDecimal(permission.getId()));
             TurbineRolePermissionPeer.doInsert(criteria);
             if (cachingEnable)
             {
@@ -415,8 +416,8 @@
             Permission permission = this.getPermission(permissionName);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineRolePermissionPeer.ROLE_ID, role.getId());
-            criteria.add(TurbineRolePermissionPeer.PERMISSION_ID, permission.getId());
+            criteria.add(TurbineRolePermissionPeer.ROLE_ID, new BigDecimal(role.getId()));
+            criteria.add(TurbineRolePermissionPeer.PERMISSION_ID, new BigDecimal(permission.getId()));
             TurbineRolePermissionPeer.doDelete(criteria);
             if (cachingEnable)
             {
@@ -459,8 +460,8 @@
             Permission permission = this.getPermission(permissionName);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineRolePermissionPeer.ROLE_ID, role.getId());
-            criteria.add(TurbineRolePermissionPeer.PERMISSION_ID, permission.getId());
+            criteria.add(TurbineRolePermissionPeer.ROLE_ID, new BigDecimal(role.getId()));
+            criteria.add(TurbineRolePermissionPeer.PERMISSION_ID, new BigDecimal(permission.getId()));
             permissions = TurbineRolePermissionPeer.doSelect(criteria);
 
         }
Index: TurbineRoleManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java,v
retrieving revision 1.10
diff -u -r1.10 TurbineRoleManagement.java
--- TurbineRoleManagement.java	9 Jun 2003 22:06:57 -0000	1.10
+++ TurbineRoleManagement.java	7 Jul 2003 16:32:52 -0000
@@ -54,6 +54,7 @@
 
 package org.apache.jetspeed.services.security.turbine;
 
+import java.math.BigDecimal;
 import java.sql.Connection;
 import java.util.Iterator;
 import java.util.List;
@@ -169,7 +170,7 @@
             throw new RoleException("Failed to Retrieve User: ", e);
         }
         Criteria criteria = new Criteria();
-        criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
+        criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
         List rels;
         HashMap roles;
 
@@ -382,11 +383,11 @@
             {
                 // CASCADE TURBINE_USER_GROUP_ROLE, TURBINE_ROLE_PERMISSION
                 Criteria criteria1 = new Criteria();
-                criteria1.add(TurbineUserGroupRolePeer.ROLE_ID, role.getId());
+                criteria1.add(TurbineUserGroupRolePeer.ROLE_ID, new BigDecimal(role.getId()));
                 TurbineUserGroupRolePeer.doDelete(criteria1, conn);
 
                 Criteria criteria2 = new Criteria();
-                criteria2.add(TurbineRolePermissionPeer.ROLE_ID, role.getId());
+                criteria2.add(TurbineRolePermissionPeer.ROLE_ID, new BigDecimal(role.getId()));
                 TurbineRolePermissionPeer.doDelete(criteria2, conn);
             }
 
@@ -446,9 +447,9 @@
             Role role = this.getRole(rolename);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
-            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, JetspeedSecurity.JETSPEED_GROUP_ID);
-            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, role.getId());
+            criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
+            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, new BigDecimal(JetspeedSecurity.JETSPEED_GROUP_ID));
+            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, new BigDecimal(role.getId()));
             TurbineUserGroupRolePeer.doInsert(criteria);
 
             if (cachingEnable)
@@ -482,9 +483,9 @@
             Role role = this.getRole(rolename);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
-            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, JetspeedSecurity.JETSPEED_GROUP_ID);
-            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, role.getId());
+            criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
+            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, new BigDecimal(JetspeedSecurity.JETSPEED_GROUP_ID));
+            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, new BigDecimal(role.getId()));
             TurbineUserGroupRolePeer.doDelete(criteria);
 
             if (cachingEnable)
@@ -530,9 +531,9 @@
             Role role = this.getRole(rolename);
 
             Criteria criteria = new Criteria();
-            criteria.add(TurbineUserGroupRolePeer.USER_ID, user.getUserId());
-            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, JetspeedSecurity.JETSPEED_GROUP_ID);
-            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, role.getId());
+            criteria.add(TurbineUserGroupRolePeer.USER_ID, new BigDecimal(user.getUserId()));
+            criteria.add(TurbineUserGroupRolePeer.GROUP_ID, new BigDecimal(JetspeedSecurity.JETSPEED_GROUP_ID));
+            criteria.add(TurbineUserGroupRolePeer.ROLE_ID, new BigDecimal(role.getId()));
             roles = TurbineUserGroupRolePeer.doSelect(criteria);
 
         }