mpoeschl 2002/12/12 07:52:33
Modified: src/java/org/apache/turbine/services/security/db
DBSecurityService.java
src/java/org/apache/turbine/services/schedule
JobEntryPeer.java
src/java/org/apache/turbine/services/db
TurbineMapBrokerService.java
src/java/org/apache/turbine/om/security/peer
TurbineUserPeer.java RolePeer.java
PermissionPeer.java GroupPeer.java
. project.xml
Log:
upgrade to torque-3.1-dev
Revision Changes Path
1.7 +4 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DBSecurityService.java 11 Jul 2002 07:34:31 -0000 1.6
+++ DBSecurityService.java 12 Dec 2002 15:52:32 -0000 1.7
@@ -60,6 +60,7 @@
import java.util.List;
import java.util.Vector;
import org.apache.torque.om.BaseObject;
+import org.apache.torque.om.NumberKey;
import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
@@ -322,7 +323,7 @@
// Criteria criteria = new Criteria();
// criteria.add(UserGroupRolePeer.USER_ID,
((BaseObject)user).getPrimaryKey());
// UserGroupRolePeer.doDelete(criteria);
- int id = ((BaseObject)user).getPrimaryKeyAsInt();
+ int id = ((NumberKey) ((BaseObject)
user).getPrimaryKey()).intValue();
UserGroupRolePeer.deleteAll(UserGroupRolePeer.TABLE_NAME,
UserGroupRolePeer.USER_ID, id);
return;
}
@@ -460,7 +461,7 @@
// criteria.add(RolePermissionPeer.ROLE_ID, role.getPrimaryKey());
// RolePermissionPeer.doDelete(criteria);
- int id = ((TurbineRole)role).getPrimaryKeyAsInt();
+ int id = ((NumberKey)
((TurbineRole)role).getPrimaryKey()).intValue();
RolePermissionPeer.deleteAll(RolePermissionPeer.TABLE_NAME,
RolePermissionPeer.ROLE_ID, id);
return;
1.4 +4 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java
Index: JobEntryPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JobEntryPeer.java 11 Jul 2002 07:34:30 -0000 1.3
+++ JobEntryPeer.java 12 Dec 2002 15:52:32 -0000 1.4
@@ -54,17 +54,18 @@
* <http://www.apache.org/>.
*/
-import com.workingdogs.village.Record;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
import org.apache.torque.TorqueException;
+import org.apache.torque.om.NumberKey;
import org.apache.torque.om.ObjectKey;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
+import com.workingdogs.village.Record;
/**
* Peer class for JobEntry database access.
@@ -140,7 +141,7 @@
Hashtable tempHash = (Hashtable)
ObjectUtils.deserialize(objectData);
JobEntry je = new JobEntry(sec, min, hr, wd, d_m, task);
- je.setPrimaryKey(oid);
+ je.setPrimaryKey(new NumberKey(oid));
je.setEmail(email);
je.setProperty(tempHash);
je.setModified(false);
1.8 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/db/TurbineMapBrokerService.java
Index: TurbineMapBrokerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/db/TurbineMapBrokerService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineMapBrokerService.java 12 Jul 2002 20:46:55 -0000 1.7
+++ TurbineMapBrokerService.java 12 Dec 2002 15:52:32 -0000 1.8
@@ -90,7 +90,7 @@
*/
public String getDefaultMap()
{
- return Torque.getDefaultMap();
+ return Torque.getDefaultDB();
}
/**
1.4 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineUserPeer.java 11 Jul 2002 07:34:30 -0000 1.3
+++ TurbineUserPeer.java 12 Dec 2002 15:52:32 -0000 1.4
@@ -353,7 +353,7 @@
throws TorqueException
{
// stuff for postgresql problem.....
- criteria.setBlobFlag();
+ criteria.setBlobFlag(true);
// add User table columns
addSelectColumns(criteria);
@@ -410,7 +410,7 @@
throws TorqueException
{
// stuff for postgresql problem.....
- criteria.setBlobFlag();
+ criteria.setBlobFlag(true);
// add User table columns
addSelectColumns(criteria);
1.4 +3 -2
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePeer.java
Index: RolePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePeer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RolePeer.java 11 Jul 2002 07:34:30 -0000 1.3
+++ RolePeer.java 12 Dec 2002 15:52:32 -0000 1.4
@@ -60,6 +60,7 @@
import java.util.Map;
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
+import org.apache.torque.om.NumberKey;
import org.apache.torque.om.Persistent;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
@@ -197,7 +198,7 @@
//Role obj = new Role();
Role obj = new TurbineRole();
Record row = (Record) rows.get(i);
- ((TurbineRole) obj).setPrimaryKey(row.getValue(1).asInt());
+ ((TurbineRole) obj).setPrimaryKey(new
NumberKey(row.getValue(1).asInt()));
((TurbineRole) obj).setName(row.getValue(2).asString());
byte[] objectData = (byte[]) row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
1.4 +4 -3
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
Index: PermissionPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PermissionPeer.java 11 Jul 2002 07:34:30 -0000 1.3
+++ PermissionPeer.java 12 Dec 2002 15:52:32 -0000 1.4
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import com.workingdogs.village.Record;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
@@ -62,6 +61,7 @@
import java.util.Vector;
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
+import org.apache.torque.om.NumberKey;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Permission;
@@ -73,6 +73,7 @@
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.PermissionSet;
+import com.workingdogs.village.Record;
/**
* This class handles all the database access for the PERMISSION
@@ -188,7 +189,7 @@
{
Permission obj = TurbineSecurity.getNewPermission(null);
Record row = (Record) rows.get(i);
- ((SecurityObject) obj).setPrimaryKey( row.getValue(1).asInt() );
+ ((SecurityObject) obj).setPrimaryKey(new
NumberKey(row.getValue(1).asInt()));
((SecurityObject) obj).setName( row.getValue(2).asString() );
byte[] objectData = (byte[]) row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
1.4 +3 -2
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
Index: GroupPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GroupPeer.java 11 Jul 2002 07:34:30 -0000 1.3
+++ GroupPeer.java 12 Dec 2002 15:52:32 -0000 1.4
@@ -60,6 +60,7 @@
import java.util.Map;
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
+import org.apache.torque.om.NumberKey;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Group;
@@ -171,7 +172,7 @@
{
Group obj = TurbineSecurity.getNewGroup(null);
Record row = (Record) rows.get(i);
- ((SecurityObject) obj).setPrimaryKey(row.getValue(1).asInt());
+ ((SecurityObject) obj).setPrimaryKey(new
NumberKey(row.getValue(1).asInt()));
((SecurityObject) obj).setName(row.getValue(2).asString());
byte[] objectData = (byte[]) row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
1.62 +1 -1 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- project.xml 8 Dec 2002 17:37:21 -0000 1.61
+++ project.xml 12 Dec 2002 15:52:33 -0000 1.62
@@ -448,7 +448,7 @@
</dependency>
<dependency>
<id>torque</id>
- <version>3.0</version>
+ <version>3.1-dev</version>
<url>http://jakarta.apache.org/turbine/torque/</url>
<properties>
<war.bundle.jar>true</war.bundle.jar>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
