Author: tv
Date: Fri Sep 27 09:00:14 2013
New Revision: 1526838
URL: http://svn.apache.org/r1526838
Log:
Temporarily add the code that should have been generated by Torque, until 4.1
is released
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
Fri Sep 27 09:00:14 2013
@@ -59,8 +59,12 @@ public abstract class TorqueAbstractBasi
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueBasicUserGroup>
getTorqueBasicUserGroupsJoinTorqueBasicUser(Criteria criteria, Connection con)
- throws TorqueException;
+ protected List<TorqueBasicUserGroup>
getTorqueBasicUserGroupsJoinTorqueBasicUser(Criteria criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueBasicUserGroupPeer.GROUP_ID, getEntityId() );
+ return TorqueBasicUserGroupPeer.doSelectJoinTorqueBasicUser(criteria,
con);
+ }
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicGroup#addUser(org.apache.fulcrum.security.entity.User)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
Fri Sep 27 09:00:14 2013
@@ -58,8 +58,12 @@ public abstract class TorqueAbstractBasi
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueBasicUserGroup>
getTorqueBasicUserGroupsJoinTorqueBasicGroup(Criteria criteria, Connection con)
- throws TorqueException;
+ protected List<TorqueBasicUserGroup>
getTorqueBasicUserGroupsJoinTorqueBasicGroup(Criteria criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueBasicUserGroupPeer.USER_ID, getEntityId() );
+ return TorqueBasicUserGroupPeer.doSelectJoinTorqueBasicGroup(criteria,
con);
+ }
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#addGroup(org.apache.fulcrum.security.entity.Group)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
Fri Sep 27 09:00:14 2013
@@ -65,8 +65,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueDynamicUserGroup>
getTorqueDynamicUserGroupsJoinTorqueDynamicUser(Criteria criteria, Connection
con)
- throws TorqueException;
+ protected List<TorqueDynamicUserGroup>
getTorqueDynamicUserGroupsJoinTorqueDynamicUser(Criteria criteria, Connection
con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicUserGroupPeer.GROUP_ID, getEntityId() );
+ return
TorqueDynamicUserGroupPeer.doSelectJoinTorqueDynamicUser(criteria, con);
+ }
/**
* Forward reference to generated code
@@ -80,8 +84,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Role/Group relations
*/
- protected abstract List<TorqueDynamicGroupRole>
getTorqueDynamicGroupRolesJoinTorqueDynamicRole(Criteria criteria, Connection
con)
- throws TorqueException;
+ protected List<TorqueDynamicGroupRole>
getTorqueDynamicGroupRolesJoinTorqueDynamicRole(Criteria criteria, Connection
con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicGroupRolePeer.GROUP_ID, getEntityId() );
+ return
TorqueDynamicGroupRolePeer.doSelectJoinTorqueDynamicRole(criteria, con);
+ }
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicGroup#addUser(org.apache.fulcrum.security.entity.User)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
Fri Sep 27 09:00:14 2013
@@ -57,8 +57,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueDynamicRolePermission>
getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(Criteria criteria,
Connection con)
- throws TorqueException;
+ protected List<TorqueDynamicRolePermission>
getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(Criteria criteria,
Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicRolePermissionPeer.PERMISSION_ID,
getEntityId() );
+ return
TorqueDynamicRolePermissionPeer.doSelectJoinTorqueDynamicRole(criteria, con);
+ }
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission#addRole(org.apache.fulcrum.security.entity.Role)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
Fri Sep 27 09:00:14 2013
@@ -66,8 +66,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueDynamicRolePermission>
getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(Criteria criteria,
Connection con)
- throws TorqueException;
+ protected List<TorqueDynamicRolePermission>
getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(Criteria criteria,
Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicRolePermissionPeer.ROLE_ID, getEntityId() );
+ return
TorqueDynamicRolePermissionPeer.doSelectJoinTorqueDynamicPermission(criteria,
con);
+ }
/**
* Forward reference to generated code
@@ -81,8 +85,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of Group/Role relations
*/
- protected abstract List<TorqueDynamicGroupRole>
getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(Criteria criteria, Connection
con)
- throws TorqueException;
+ protected List<TorqueDynamicGroupRole>
getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(Criteria criteria, Connection
con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicGroupRolePeer.ROLE_ID, getEntityId() );
+ return
TorqueDynamicGroupRolePeer.doSelectJoinTorqueDynamicGroup(criteria, con);
+ }
/**
* @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicRole#addGroup(org.apache.fulcrum.security.entity.Group)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
Fri Sep 27 09:00:14 2013
@@ -68,8 +68,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueDynamicUserGroup>
getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(Criteria criteria, Connection
con)
- throws TorqueException;
+ protected List<TorqueDynamicUserGroup>
getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(Criteria criteria, Connection
con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicUserGroupPeer.USER_ID, getEntityId() );
+ return
TorqueDynamicUserGroupPeer.doSelectJoinTorqueDynamicGroup(criteria, con);
+ }
/**
* Forward reference to generated code
@@ -83,8 +87,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Delegator relations
*/
- protected abstract List<TorqueDynamicUserDelegates>
getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(Criteria
criteria, Connection con)
- throws TorqueException;
+ protected List<TorqueDynamicUserDelegates>
getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(Criteria
criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID,
getEntityId() );
+ return
TorqueDynamicUserDelegatesPeer.doSelectJoinTorqueDynamicUserRelatedByDelegatorUserId(criteria,
con);
+ }
/**
* Forward reference to generated code
@@ -98,8 +106,12 @@ public abstract class TorqueAbstractDyna
*
* @return a list of User/Delegator relations
*/
- protected abstract List<TorqueDynamicUserDelegates>
getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(Criteria
criteria, Connection con)
- throws TorqueException;
+ protected List<TorqueDynamicUserDelegates>
getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(Criteria
criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueDynamicUserDelegatesPeer.DELEGATOR_USER_ID,
getEntityId() );
+ return
TorqueDynamicUserDelegatesPeer.doSelectJoinTorqueDynamicUserRelatedByDelegateeUserId(criteria,
con);
+ }
/**
* @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#addGroup(org.apache.fulcrum.security.entity.Group)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
Fri Sep 27 09:00:14 2013
@@ -54,8 +54,12 @@ public abstract class TorqueAbstractTurb
*
* @return a list of User/Group/Role relations
*/
- protected abstract List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria,
Connection con)
- throws TorqueException;
+ protected List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria,
Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueTurbineUserGroupRolePeer.GROUP_ID, getEntityId() );
+ return
TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineRole(criteria, con);
+ }
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
Fri Sep 27 09:00:14 2013
@@ -58,8 +58,12 @@ public abstract class TorqueAbstractTurb
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueTurbineRolePermission>
getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(Criteria criteria,
Connection con)
- throws TorqueException;
+ protected List<TorqueTurbineRolePermission>
getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(Criteria criteria,
Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueTurbineRolePermissionPeer.PERMISSION_ID,
getEntityId() );
+ return
TorqueTurbineRolePermissionPeer.doSelectJoinTorqueTurbineRole(criteria, con);
+ }
/**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#addRole(org.apache.fulcrum.security.entity.Role)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java?rev=1526838&r1=1526837&r2=1526838&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
Fri Sep 27 09:00:14 2013
@@ -61,8 +61,12 @@ public abstract class TorqueAbstractTurb
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueTurbineRolePermission>
getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(Criteria criteria,
Connection con)
- throws TorqueException;
+ protected List<TorqueTurbineRolePermission>
getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(Criteria criteria,
Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueTurbineRolePermissionPeer.ROLE_ID, getEntityId() );
+ return
TorqueTurbineRolePermissionPeer.doSelectJoinTorqueTurbinePermission(criteria,
con);
+ }
/**
* Forward reference to generated code
@@ -76,8 +80,12 @@ public abstract class TorqueAbstractTurb
*
* @return a list of User/Group/Role relations
*/
- protected abstract List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria,
Connection con)
- throws TorqueException;
+ protected List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria,
Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueTurbineUserGroupRolePeer.ROLE_ID, getEntityId() );
+ return
TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineGroup(criteria, con);
+ }
/**
* @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#addPermission(org.apache.fulcrum.security.entity.Permission)
Modified:
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/TorqueAbstractTurbineUser.java?rev=1526838&r1=1526837&r2=1526838&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/TorqueAbstractTurbineUser.java
Fri Sep 27 09:00:14 2013
@@ -54,8 +54,12 @@ public abstract class TorqueAbstractTurb
*
* @return a list of User/Group/Role relations
*/
- protected abstract List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria,
Connection con)
- throws TorqueException;
+ protected List<TorqueTurbineUserGroupRole>
getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria,
Connection con)
+ throws TorqueException
+ {
+ criteria.and(TorqueTurbineUserGroupRolePeer.USER_ID, getEntityId() );
+ return
TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineRole(criteria, con);
+ }
/**
* @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
