Author: gk
Date: Mon Nov 27 14:19:32 2017
New Revision: 1816457
URL: http://svn.apache.org/viewvc?rev=1816457&view=rev
Log:
- require in turbine schema interface
o.a.f.security.model.turbine.entity.TurbineUser
- remove TurbineUser from o.a.d.security.torque.turbine.*AbstractTurbineUser
classes
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/impl/AbstractTurbineSecurityEntityImpl.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.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/FulcrumAbstractTurbineUser.java
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/impl/AbstractTurbineSecurityEntityImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/impl/AbstractTurbineSecurityEntityImpl.java?rev=1816457&r1=1816456&r2=1816457&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/impl/AbstractTurbineSecurityEntityImpl.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/entity/impl/AbstractTurbineSecurityEntityImpl.java
Mon Nov 27 14:19:32 2017
@@ -24,6 +24,7 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
+import
org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity;
/**
* Represents the "turbine" model where permissions are in a many to many
@@ -33,7 +34,7 @@ import org.apache.fulcrum.security.model
* @author <a href="mailto:[email protected]";>Eric Pugh </a>
* @version $Id: TurbineGroup.java 223081 2004-10-07 15:11:58Z epugh $
*/
-public abstract class AbstractTurbineSecurityEntityImpl extends
SecurityEntityImpl
+public abstract class AbstractTurbineSecurityEntityImpl extends
SecurityEntityImpl implements TurbineUserGroupRoleEntity
{
private Set<? extends TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
Modified:
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java?rev=1816457&r1=1816456&r2=1816457&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
Mon Nov 27 14:19:32 2017
@@ -74,7 +74,7 @@ public abstract class AbstractTurbineMod
userManager = securityService.getUserManager();
groupManager = securityService.getGroupManager();
permissionManager = securityService.getPermissionManager();
- modelManager = (TurbineModelManager)
securityService.getModelManager();
+ modelManager = (TurbineModelManager) securityService.getModelManager();
}
Modified:
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml?rev=1816457&r1=1816456&r2=1816457&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
(original)
+++
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
Mon Nov 27 14:19:32 2017
@@ -70,7 +70,8 @@
</table>
<table name="TURBINE_USER" javaName="TurbineUser" idMethod="native"
-
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineUser">
+
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineUser"
+
interface="org.apache.fulcrum.security.model.turbine.entity.TurbineUser">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
<column name="LOGIN_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
<column name="PASSWORD_VALUE" required="true" size="16" type="VARCHAR"
javaName="Password"/>
Modified:
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml?rev=1816457&r1=1816456&r2=1816457&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
(original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml Mon
Nov 27 14:19:32 2017
@@ -70,7 +70,8 @@
</table>
<table name="FULCRUM_TURBINE_USER" javaName="TorqueTurbineUser"
idMethod="idbroker"
-
baseClass="org.apache.fulcrum.security.torque.turbine.FulcrumAbstractTurbineUser">
+
baseClass="org.apache.fulcrum.security.torque.turbine.FulcrumAbstractTurbineUser"
+
interface="org.apache.fulcrum.security.model.turbine.entity.TurbineUser">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
<column name="LOGIN_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
<column name="PASSWORD_VALUE" required="true" size="16" type="VARCHAR"
javaName="Password"/>
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java?rev=1816457&r1=1816456&r2=1816457&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
Mon Nov 27 14:19:32 2017
@@ -25,12 +25,14 @@ import org.apache.fulcrum.security.model
import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
/**
* This abstract class provides the SecurityInterface to the managers.
+ *
+ * Additional Torque contract
*
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
public abstract class TorqueAbstractTurbineTurbineSecurityEntity extends
TorqueAbstractSecurityEntity
- implements TurbineUserGroupRoleEntity
+ implements TurbineUserGroupRoleEntity // not in group and role but already
in TurbineUser interface
{
/** Serial version */
private static final long serialVersionUID = -6230312046016785990L;
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=1816457&r1=1816456&r2=1816457&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
Mon Nov 27 14:19:32 2017
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.fulcrum.security.torque.om.TurbineUserGroupRolePeer;
@@ -32,12 +33,13 @@ import org.apache.torque.criteria.Criter
import org.apache.torque.om.SimpleKey;
/**
* This abstract class provides the SecurityInterface to the managers.
+ *
+ * An implementing class is required to implement {@link User} at least. Most
probably the OM classes allow to implement {@link TurbineUser}, which includes
User.
*
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
public abstract class DefaultAbstractTurbineUser extends
TorqueAbstractTurbineTurbineSecurityEntity
- implements TurbineUser
{
/** Serial version */
private static final long serialVersionUID = -7255623655281852566L;
@@ -75,7 +77,7 @@ public abstract class DefaultAbstractTur
for (org.apache.fulcrum.security.torque.om.TurbineUserGroupRole ttugr
: ugrs)
{
TurbineUserGroupRole ugr = new TurbineUserGroupRole();
- ugr.setUser(this);
+ ugr.setUser((User) this);
ugr.setRole(ttugr.getTurbineRole());
// org.apache.fulcrum.security.torque.om.TurbineGroup implements
// org.apache.fulcrum.security.model.turbine.entity.TurbineGroup
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=1816457&r1=1816456&r2=1816457&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
Mon Nov 27 14:19:32 2017
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
@@ -33,12 +34,13 @@ import org.apache.torque.criteria.Criter
import org.apache.torque.om.SimpleKey;
/**
* This abstract class provides the SecurityInterface to the managers.
+ *
+ * An implementing class is required to implement {@link User} at least. Most
probably the OM classes allow to implement {@link TurbineUser}, which includes
User.
*
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
public abstract class FulcrumAbstractTurbineUser extends
TorqueAbstractTurbineTurbineSecurityEntity
- implements TurbineUser
{
/** Serial version */
private static final long serialVersionUID = -7255623655281852566L;
@@ -76,7 +78,7 @@ public abstract class FulcrumAbstractTur
for (TorqueTurbineUserGroupRole ttugr : ugrs)
{
TurbineUserGroupRole ugr = new TurbineUserGroupRole();
- ugr.setUser(this);
+ ugr.setUser((User) this);
ugr.setRole(ttugr.getTorqueTurbineRole());
ugr.setGroup(ttugr.getTorqueTurbineGroup(con));
userGroupRoleSet.add(ugr);
