You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2018/01/18 10:54:59 UTC
svn commit: r1821478 - in /turbine/fulcrum/trunk/security: api/src/changes/
api/src/java/org/apache/fulcrum/security/model/turbine/ src/changes/
torque/src/java/org/apache/fulcrum/security/torque/basic/
torque/src/java/org/apache/fulcrum/security/torqu...
Author: gk
Date: Thu Jan 18 10:54:59 2018
New Revision: 1821478
URL: http://svn.apache.org/viewvc?rev=1821478&view=rev
Log:
- update changes in api, master
- add code hints
- clean up
Modified:
turbine/fulcrum/trunk/security/api/src/changes/changes.xml
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
turbine/fulcrum/trunk/security/src/changes/changes.xml
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.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/TorqueAbstractDynamicUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
Modified: turbine/fulcrum/trunk/security/api/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/changes/changes.xml?rev=1821478&r1=1821477&r2=1821478&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/changes/changes.xml Thu Jan 18 10:54:59 2018
@@ -24,7 +24,13 @@
</properties>
<body>
- <release version="1.1.1" date="in SVN">
+ <release version="1.1.2" date="in Subversion">
+ <action type="update" dev="gk">
+ - added revokeAll group/role method in model manager
+ - method getUserGroupRoleSet, addUserGroupRole, removeUserGroupRole now throws DataBackendException, changed interface TurbineUserGroupRoleEntity
+ </action>
+ </release>
+ <release version="1.1.1" date="2017-05-12">
<action type="fix" dev="gk">
Make objectData and peers (manager) transient
Make managers serializable
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java?rev=1821478&r1=1821477&r2=1821478&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java Thu Jan 18 10:54:59 2018
@@ -46,6 +46,13 @@ public interface TurbineModelManager ext
* The name of the <a href="#global">global group</a>, if no global group name is set in model manager
*/
public String GLOBAL_GROUP_NAME = "global";
+
+ /**
+ * TODO
+ * <li>transactional revoke/grant = replace for global group/role?
+ * <li>may allow user - group assignments without role, i.e. with default role. Requires adding/defining default/zero role for group, you have then to the global role additionally a global group.
+ * This may be relevant, if just only one group is sufficient (or at least one).
+ */
/**
* Provides a reference to the Group object that represents the <a
Modified: turbine/fulcrum/trunk/security/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/changes/changes.xml?rev=1821478&r1=1821477&r2=1821478&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/security/src/changes/changes.xml Thu Jan 18 10:54:59 2018
@@ -25,10 +25,11 @@
<body>
<release version="1.1.2" date="in Subversion">
<action type="update" dev="gk">
- Torque Turbine Relationships in ACL (Access Control List, which is immutable) with custom relationships: If not using the provided OM classes two approaches exist to get proper ACL user/role/groups. Either overriding or by configuration: Overriding the method retrieveAttachedObjects is done in custom User OM class or use xml configuration and proper schema interface settings (Torque OM), cft. test example.
+ - Torque Turbine Relationships in ACL (Access Control List, which is immutable) with custom relationships: If not using the provided OM classes two approaches exist to get proper ACL user/role/groups. Either overriding or by configuration: Overriding the method retrieveAttachedObjects is done in custom User OM class or use xml configuration and proper schema interface settings (Torque OM), cft. test example.
+ - Added interfaces (TorqueTurbineUserGroupRolePeer, TurbineUserGroupRoleModelPeerMapper) and abstract class (TorqueAbstractTurbineTurbineSecurityEntityDefault) for OM mapping.
+ - retrieveAttachedObjects with lazy parameter
Added lazy loading flag if retrieving attachedObjects, i.e. related user role or user group associations are loaded only if requested. If, where and how lazy loading occurs depends on the the manager classes. Currently only group and role manager use it. Configurable with attribute lazy per manager. As a consequence some more methods may now throw DataBackendException.
- Added revokeAll(Group) method in model manager.
- Add interfaces for OM mapping.
+ - Implement revokeAll(Group) method in model manager.
</action>
<action type="update" dev="gk">
Torque Fulcrum and Default schema, support for Peer interface, global group name configurable in model manager
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java?rev=1821478&r1=1821477&r2=1821478&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java Thu Jan 18 10:54:59 2018
@@ -37,6 +37,11 @@ import org.apache.torque.criteria.Criter
public class TorqueBasicUserManagerImpl extends TorqueAbstractUserManager
{
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectAllUsers(java.sql.Connection)
*/
@SuppressWarnings("unchecked")
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=1821478&r1=1821477&r2=1821478&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 Thu Jan 18 10:54:59 2018
@@ -106,11 +106,11 @@ public abstract class TorqueAbstractDyna
{
if (userSet == null)
{
- userSet = new UserSet();
+ userSet = new UserSet<User>();
}
else if(!(userSet instanceof UserSet))
{
- userSet = new UserSet(userSet);
+ userSet = new UserSet<User>(userSet);
}
return (UserSet)userSet;
@@ -140,11 +140,11 @@ public abstract class TorqueAbstractDyna
{
if(userSet != null)
{
- this.userSet = userSet;
+ this.userSet = (UserSet<User>) userSet;
}
else
{
- this.userSet = new UserSet();
+ this.userSet = new UserSet<User>();
}
}
@@ -153,7 +153,7 @@ public abstract class TorqueAbstractDyna
*/
public <T extends User> void setUsersAsSet(Set<T> users)
{
- setUsers(new UserSet(users));
+ setUsers(new UserSet<User>(users));
}
/**
@@ -243,7 +243,7 @@ public abstract class TorqueAbstractDyna
public void retrieveAttachedObjects( Connection con, Boolean lazy )
throws TorqueException
{
- this.userSet = new UserSet();
+ this.userSet = new UserSet<User>();
List<TorqueDynamicUserGroup> usergroups = getTorqueDynamicUserGroupsJoinTorqueDynamicUser(new Criteria(), con);
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=1821478&r1=1821477&r2=1821478&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 Thu Jan 18 10:54:59 2018
@@ -186,7 +186,7 @@ public abstract class TorqueAbstractDyna
{
if (delegatees == null)
{
- delegatees = new UserSet();
+ delegatees = new UserSet<T>();
}
return (Set<T>)delegatees;
@@ -200,7 +200,7 @@ public abstract class TorqueAbstractDyna
{
if (delegators == null)
{
- delegators = new UserSet();
+ delegators = new UserSet<T>();
}
return (Set<T>)delegators;
@@ -213,11 +213,11 @@ public abstract class TorqueAbstractDyna
{
if (delegatees != null)
{
- this.delegatees = new UserSet(delegatees);
+ this.delegatees = new UserSet<T>(delegatees);
}
else
{
- this.delegatees = new UserSet();
+ this.delegatees = new UserSet<T>();
}
}
@@ -228,11 +228,11 @@ public abstract class TorqueAbstractDyna
{
if (delegators != null)
{
- this.delegators = new UserSet(delegates);
+ this.delegators = new UserSet<T>(delegates);
}
else
{
- this.delegators = new UserSet();
+ this.delegators = new UserSet<T>();
}
}
@@ -267,7 +267,7 @@ public abstract class TorqueAbstractDyna
groupSet.add(tdug.getTorqueDynamicGroup());
}
- this.delegators = new UserSet();
+ this.delegators = new UserSet<User>();
List<TorqueDynamicUserDelegates> delegatorlist = getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(new Criteria(), con);
@@ -276,7 +276,7 @@ public abstract class TorqueAbstractDyna
delegators.add(tdud.getTorqueDynamicUserRelatedByDelegatorUserId());
}
- this.delegatees = new UserSet();
+ this.delegatees = new UserSet<User>();
List<TorqueDynamicUserDelegates> delegateelist = getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(new Criteria(), con);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java?rev=1821478&r1=1821477&r2=1821478&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java Thu Jan 18 10:54:59 2018
@@ -37,6 +37,11 @@ import org.apache.torque.criteria.Criter
public class TorqueDynamicUserManagerImpl extends TorqueAbstractUserManager
{
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* @see org.apache.fulcrum.security.torque.TorqueAbstractUserManager#doSelectAllUsers(java.sql.Connection)
*/
@SuppressWarnings("unchecked")
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java?rev=1821478&r1=1821477&r2=1821478&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java Thu Jan 18 10:54:59 2018
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.sql.Connection;
@@ -31,7 +30,6 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TurbinePermissionPeer;
import org.apache.fulcrum.security.torque.om.TurbineRolePeer;
import org.apache.fulcrum.security.torque.om.TurbineRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TurbineUserGroupRolePeer;
import org.apache.fulcrum.security.torque.om.TurbineUserPeer;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;