Author: gk
Date: Thu Dec 21 14:50:26 2017
New Revision: 1818933
URL: http://svn.apache.org/viewvc?rev=1818933&view=rev
Log:
- debug info
- reintroduce the old retrieveAttachedObjects method to allow easier migration
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
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/security/TorqueAbstractSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java
Thu Dec 21 14:50:26 2017
@@ -57,6 +57,7 @@ public abstract class TorqueAbstractGrou
{
super.configure( conf );
lazyLoading = conf.getAttributeAsBoolean( LAZY_LOADING, false);
+ getLogger().debug("setting lazyLoading: " + lazyLoading);
}
/**
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractRoleManager.java
Thu Dec 21 14:50:26 2017
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.spi.AbstractRoleManager;
import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
@@ -56,6 +57,7 @@ public abstract class TorqueAbstractRole
{
super.configure( conf );
lazyLoading = conf.getAttributeAsBoolean( LAZY_LOADING, false);
+ getLogger().debug("setting lazyLoading: " + lazyLoading);
}
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=1818933&r1=1818932&r2=1818933&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
Thu Dec 21 14:50:26 2017
@@ -130,6 +130,13 @@ public abstract class TorqueAbstractBasi
{
setUsers(new UserSet(users));
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* Retrieve attached objects such as users, permissions,....
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=1818933&r1=1818932&r2=1818933&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
Thu Dec 21 14:50:26 2017
@@ -129,6 +129,15 @@ public abstract class TorqueAbstractBasi
{
setGroups(new GroupSet(groups));
}
+ /**
+ * Retrieve attached objects such as users, permissions,....
+ */
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* Retrieve attached objects such as users, permissions,....
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=1818933&r1=1818932&r2=1818933&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 Dec 21 14:50:26 2017
@@ -228,6 +228,13 @@ public abstract class TorqueAbstractDyna
{
return TorqueDynamicGroupPeer.DATABASE_NAME;
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection,
Boolean)
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=1818933&r1=1818932&r2=1818933&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
Thu Dec 21 14:50:26 2017
@@ -136,6 +136,13 @@ public abstract class TorqueAbstractDyna
{
return TorqueDynamicPermissionPeer.DATABASE_NAME;
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection,
Boolean)
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=1818933&r1=1818932&r2=1818933&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
Thu Dec 21 14:50:26 2017
@@ -229,6 +229,13 @@ public abstract class TorqueAbstractDyna
{
return TorqueDynamicPermissionPeer.DATABASE_NAME;
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection,
Boolean)
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=1818933&r1=1818932&r2=1818933&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 Dec 21 14:50:26 2017
@@ -243,6 +243,13 @@ public abstract class TorqueAbstractDyna
{
return TorqueDynamicUserPeer.DATABASE_NAME;
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection,
Boolean)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
Thu Dec 21 14:50:26 2017
@@ -70,6 +70,13 @@ public abstract class TorqueAbstractSecu
* @param lazy if <code>true</code>, may load some or all relationships
later
*/
public abstract void retrieveAttachedObjects(Connection con, Boolean lazy)
throws TorqueException;
+
+ /**
+ * old contract, lazy is set to <code>false</code>.
+ *
+ * @param con A database connection
+ */
+ public abstract void retrieveAttachedObjects(Connection con) throws
TorqueException;
/**
* Update this instance to the database with all dependent objects
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
Thu Dec 21 14:50:26 2017
@@ -63,6 +63,12 @@ public abstract class DefaultAbstractTur
return TurbineUserGroupRolePeer.doSelectJoinTurbineRole(criteria, con);
}
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
TorqueAbstractTurbineTurbineSecurityEntity#retrieveAttachedObjects(Connection,
boolean)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
Thu Dec 21 14:50:26 2017
@@ -136,6 +136,12 @@ public abstract class DefaultAbstractTur
setRoles(new RoleSet(roles));
}
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection,
Boolean)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
Thu Dec 21 14:50:26 2017
@@ -159,6 +159,13 @@ public abstract class DefaultAbstractTur
{
setPermissions(new PermissionSet(permissions));
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
Thu Dec 21 14:50:26 2017
@@ -91,7 +91,13 @@ public abstract class DefaultAbstractTur
setUserGroupRoleSet(userGroupRoleSet);
}
}
-
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
Thu Dec 21 14:50:26 2017
@@ -63,6 +63,13 @@ public abstract class FulcrumAbstractTur
criteria.and(TorqueTurbineUserGroupRolePeer.GROUP_ID, getEntityId() );
return
TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineRole(criteria, con);
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection,
Boolean)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java
Thu Dec 21 14:50:26 2017
@@ -137,6 +137,13 @@ public abstract class FulcrumAbstractTur
{
return TorqueTurbinePermissionPeer.DATABASE_NAME;
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java
Thu Dec 21 14:50:26 2017
@@ -163,6 +163,13 @@ public abstract class FulcrumAbstractTur
return TorqueTurbineRolePeer.DATABASE_NAME;
}
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
+
/**
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(Connection,
Boolean)
*/
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java?rev=1818933&r1=1818932&r2=1818933&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineUser.java
Thu Dec 21 14:50:26 2017
@@ -63,6 +63,13 @@ public abstract class FulcrumAbstractTur
criteria.and(TorqueTurbineUserGroupRolePeer.USER_ID, getEntityId() );
return
TorqueTurbineUserGroupRolePeer.doSelectJoinTorqueTurbineRole(criteria, con);
}
+
+ @Override
+ public void retrieveAttachedObjects( Connection con )
+ throws TorqueException
+ {
+ retrieveAttachedObjects( con, false );
+ }
/**
* @see
TorqueAbstractTurbineTurbineSecurityEntity#retrieveAttachedObjects(Connection,
boolean)
