Author: gk
Date: Tue Aug 2 13:12:05 2016
New Revision: 1754910
URL: http://svn.apache.org/viewvc?rev=1754910&view=rev
Log:
TRB-98
- Added convenience for (old) Turbine schema database, abstract class names are
DefaultAbstract*, while the the new Fulcrum schema classnames start now with
FulcrumAbstract* (has been TorqueAbstract*).
- Turbine Default schema in fulcrum-turbine-default-schema.xml
- Test added, requires Hsqldb set identity to mimic native auto-increment in
fulcrum-turbine-default-schema.sql.
- Moved Security abstract classes in separate package to underline importance
- TODO: Prepare Peer Managers to get rid of imported OM-classes in
TorqueTurbine*Manager classes
Added:
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
(with props)
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
- copied, changed from r1754909,
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
- copied, changed from r1754909,
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
(with props)
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
(with props)
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
(with props)
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
(with props)
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
- copied, changed from r1754909,
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/FulcrumAbstractTurbinePermission.java
- copied, changed from r1754909,
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/FulcrumAbstractTurbineRole.java
- copied, changed from r1754909,
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/FulcrumAbstractTurbineUser.java
- copied, changed from r1754909,
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
turbine/fulcrum/trunk/security/torque/src/test/TorqueDefault.properties
(with props)
turbine/fulcrum/trunk/security/torque/src/test/TurbineDefaultWithPeersComponentConfig.xml
(with props)
turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql
(with props)
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
(with props)
Removed:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.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/TorqueAbstractTurbineTurbineSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
Modified:
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
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/TorqueAbstractPermissionManager.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/TorqueAbstractUserManager.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/basic/TorqueBasicModelManagerImpl.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/dynamic/TorqueDynamicModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerGroupManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerPermissionManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerRoleManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerUserManager.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
Added:
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=1754910&view=auto
==============================================================================
---
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
(added)
+++
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
Tue Aug 2 13:12:05 2016
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- ====================================================================
-->
+<!--
-->
+<!-- F U L C R U M D E F A U L T T U R B I N E S E C U R I T Y S C H E M A
-->
+<!--
-->
+<!-- ====================================================================
-->
+<!-- @author: <a href="mailto:[email protected]";>Thomas Vandahl</a> -->
+<!-- @version $Id$ -->
+<!-- ====================================================================
-->
+
+<database name="default"
+ defaultIdMethod="none" defaultJavaType="object"
+ xmlns="http://db.apache.org/torque/4.0/templates/database";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database.xsd";>
+
+<!--
+ after Torque 4.1 is released, add attribute
peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer"
+ to tables TURBINE_PERMISSION,TURBINE_ROLE,TURBINE_GROUP,TURBINE_USER, cft.
https://issues.apache.org/jira/browse/TRB-92 and
https://issues.apache.org/jira/browse/TORQUE-309.
+ -->
+ <table name="TURBINE_PERMISSION" javaName="TurbinePermission"
idMethod="native"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbinePermission">
+ <column name="PERMISSION_ID" required="true" primaryKey="true"
type="INTEGER" javaName="EntityId" javaType="object"/>
+ <column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
+
+ <unique>
+ <unique-column name="PERMISSION_NAME"/>
+ </unique>
+
+ </table>
+
+ <table name="TURBINE_ROLE" javaName="TurbineRole" idMethod="native"
+
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineRole">
+ <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
+ <column name="ROLE_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
+
+ <unique>
+ <unique-column name="ROLE_NAME"/>
+ </unique>
+
+ </table>
+
+ <table name="TURBINE_GROUP" javaName="TurbineGroup" idMethod="native"
+
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineGroup">
+ <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
+ <column name="GROUP_NAME" required="true" type="VARCHAR" size="64"
javaName="EntityName"/>
+
+ <unique>
+ <unique-column name="GROUP_NAME"/>
+ </unique>
+
+ </table>
+
+ <table name="TURBINE_USER" javaName="TurbineUser" idMethod="native"
+
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineUser">
+ <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"/>
+ <column name="FIRST_NAME" size="64" type="VARCHAR" javaName="FirstName"/>
+ <column name="LAST_NAME" size="64" type="VARCHAR" javaName="LastName"/>
+ <column name="EMAIL" size="64" type="VARCHAR" javaName="Email"/>
+ <column name="OBJECTDATA" type="VARBINARY" javaName="Objectdata"/>
+ <unique>
+ <unique-column name="LOGIN_NAME"/>
+ </unique>
+
+ </table>
+
+ <!-- Turbine Security Model -->
+ <table name="TURBINE_ROLE_PERMISSION" javaName="TurbineRolePermission"
idMethod="none">
+ <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
+ <column name="PERMISSION_ID" required="true" primaryKey="true"
type="INTEGER" javaType="object"/>
+
+ <foreign-key foreignTable="TURBINE_ROLE">
+ <reference local="ROLE_ID" foreign="ROLE_ID"/>
+ </foreign-key>
+
+ <foreign-key foreignTable="TURBINE_PERMISSION">
+ <reference local="PERMISSION_ID" foreign="PERMISSION_ID"/>
+ </foreign-key>
+ </table>
+
+ <table name="TURBINE_USER_GROUP_ROLE" javaName="TurbineUserGroupRole"
idMethod="none">
+ <column name="USER_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
+ <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
+ <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
+
+ <foreign-key foreignTable="TURBINE_USER">
+ <reference local="USER_ID" foreign="USER_ID"/>
+ </foreign-key>
+
+ <foreign-key foreignTable="TURBINE_GROUP">
+ <reference local="GROUP_ID" foreign="GROUP_ID"/>
+ </foreign-key>
+
+ <foreign-key foreignTable="TURBINE_ROLE">
+ <reference local="ROLE_ID" foreign="ROLE_ID"/>
+ </foreign-key>
+ </table>
+
+</database>
Propchange:
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
(original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml Tue
Aug 2 13:12:05 2016
@@ -37,7 +37,7 @@
after Torque 4.1 is released, add attribute
peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer"
to tables
FULCRUM_TURBINE_PERMISSION,FULCRUM_TURBINE_ROLE,FULCRUM_TURBINE_GROUP,FULCRUM_TURBINE_USER,
cft. https://issues.apache.org/jira/browse/TRB-92 and
https://issues.apache.org/jira/browse/TORQUE-309.
-->
- <table name="FULCRUM_TURBINE_PERMISSION" javaName="TorqueTurbinePermission"
idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbinePermission">
+ <table name="FULCRUM_TURBINE_PERMISSION" javaName="TorqueTurbinePermission"
idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.FulcrumAbstractTurbinePermission">
<column name="PERMISSION_ID" required="true" primaryKey="true"
type="INTEGER" javaName="EntityId" javaType="object"/>
<column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
@@ -48,7 +48,7 @@
</table>
<table name="FULCRUM_TURBINE_ROLE" javaName="TorqueTurbineRole"
idMethod="idbroker"
-
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineRole">
+
baseClass="org.apache.fulcrum.security.torque.turbine.FulcrumAbstractTurbineRole">
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
<column name="ROLE_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
@@ -59,7 +59,7 @@
</table>
<table name="FULCRUM_TURBINE_GROUP" javaName="TorqueTurbineGroup"
idMethod="idbroker"
-
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineGroup">
+
baseClass="org.apache.fulcrum.security.torque.turbine.FulcrumAbstractTurbineGroup">
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
<column name="GROUP_NAME" required="true" type="VARCHAR" size="64"
javaName="EntityName"/>
@@ -70,7 +70,7 @@
</table>
<table name="FULCRUM_TURBINE_USER" javaName="TorqueTurbineUser"
idMethod="idbroker"
-
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineUser">
+
baseClass="org.apache.fulcrum.security.torque.turbine.FulcrumAbstractTurbineUser">
<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/TorqueAbstractGroupManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractGroupManager.java?rev=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -24,6 +24,7 @@ import org.apache.avalon.framework.confi
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.spi.AbstractGroupManager;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.GroupSet;
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractPermissionManager.java
Tue Aug 2 13:12:05 2016
@@ -24,6 +24,7 @@ import org.apache.avalon.framework.confi
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.spi.AbstractPermissionManager;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PermissionSet;
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=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -24,6 +24,7 @@ import org.apache.avalon.framework.confi
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.spi.AbstractRoleManager;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.RoleSet;
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractUserManager.java
Tue Aug 2 13:12:05 2016
@@ -24,6 +24,7 @@ import org.apache.avalon.framework.confi
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.spi.AbstractUserManager;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.UnknownEntityException;
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=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -23,10 +23,10 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.basic.entity.BasicGroup;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueBasicGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.UserSet;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
@@ -192,7 +192,7 @@ public abstract class TorqueAbstractBasi
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
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=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -23,10 +23,10 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.model.basic.entity.BasicUser;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
@@ -190,7 +190,7 @@ public abstract class TorqueAbstractBasi
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerImpl.java
Tue Aug 2 13:12:05 2016
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.model.basic.entity.BasicGroup;
import org.apache.fulcrum.security.model.basic.entity.BasicUser;
import org.apache.fulcrum.security.spi.AbstractManager;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.torque.TorqueException;
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=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -24,12 +24,12 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.UserSet;
import org.apache.torque.TorqueException;
@@ -222,7 +222,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
{
@@ -230,7 +230,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
@@ -254,7 +254,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
public void update(Connection con) throws TorqueException
{
@@ -303,7 +303,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
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=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -23,10 +23,10 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermission;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
@@ -130,7 +130,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
{
@@ -138,7 +138,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
@@ -153,7 +153,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
public void update(Connection con) throws TorqueException
{
@@ -185,7 +185,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
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=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -24,13 +24,13 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermission;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.torque.TorqueException;
@@ -223,7 +223,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
{
@@ -231,7 +231,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
@@ -255,7 +255,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
public void update(Connection con) throws TorqueException
{
@@ -304,7 +304,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
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=1754910&r1=1754909&r2=1754910&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
Tue Aug 2 13:12:05 2016
@@ -24,12 +24,12 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegates;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroup;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UserSet;
import org.apache.torque.TorqueException;
@@ -237,7 +237,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
{
@@ -245,7 +245,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
@@ -278,7 +278,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
public void update(Connection con) throws TorqueException
{
@@ -344,7 +344,7 @@ public abstract class TorqueAbstractDyna
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerImpl.java
Tue Aug 2 13:12:05 2016
@@ -29,7 +29,7 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.model.dynamic.entity.DynamicPermission;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.torque.TorqueException;
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerGroupManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerGroupManager.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerGroupManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerGroupManager.java
Tue Aug 2 13:12:05 2016
@@ -50,6 +50,7 @@ public abstract class PeerGroupManager e
{
super.configure( conf );
+ // peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue(
"org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeer" );
peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue( null );
if (peerClassName != null) {
setPeerClassName( peerClassName );
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerPermissionManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerPermissionManager.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerPermissionManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerPermissionManager.java
Tue Aug 2 13:12:05 2016
@@ -39,7 +39,7 @@ public abstract class PeerPermissionMana
private static final String PEER_CLASS_NAME_KEY = "peerClassName";
PeerManager peerManager;
- private String columnName = "ROLE_NAME";
+ private String columnName = "PERMISSION_NAME";
/**
* Avalon Service lifecycle method
@@ -49,6 +49,7 @@ public abstract class PeerPermissionMana
{
super.configure( conf );
+ //peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue(
"org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer" );
peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue( null );
if (peerClassName != null) {
setPeerClassName( peerClassName );
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerRoleManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerRoleManager.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerRoleManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerRoleManager.java
Tue Aug 2 13:12:05 2016
@@ -49,6 +49,7 @@ public abstract class PeerRoleManager ex
{
super.configure( conf );
+// peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue(
"org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeer" );
peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue( null );
if (peerClassName != null) {
setPeerClassName( peerClassName );
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerUserManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerUserManager.java?rev=1754910&r1=1754909&r2=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerUserManager.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/managers/PeerUserManager.java
Tue Aug 2 13:12:05 2016
@@ -52,6 +52,7 @@ public abstract class PeerUserManager ex
{
super.configure( conf );
+// peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue(
"org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer" );
peerClassName = conf.getChild( PEER_CLASS_NAME_KEY).getValue( null );
if (peerClassName != null) {
setPeerClassName( peerClassName );
Copied:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
(from r1754909,
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java)
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java?p2=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java&p1=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java&r1=1754909&r2=1754910&rev=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
Tue Aug 2 13:12:05 2016
@@ -1,4 +1,4 @@
-package org.apache.fulcrum.security.torque;
+package org.apache.fulcrum.security.torque.security;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
(from r1754909,
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/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?p2=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java&p1=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java&r1=1754909&r2=1754910&rev=1754910&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntity.java
Tue Aug 2 13:12:05 2016
@@ -1,4 +1,4 @@
-package org.apache.fulcrum.security.torque.turbine;
+package org.apache.fulcrum.security.torque.security.turbine;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,7 +22,7 @@ import java.util.Set;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import
org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
/**
* This abstract class provides the SecurityInterface to the managers.
*
Added:
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=1754910&view=auto
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
(added)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
Tue Aug 2 13:12:05 2016
@@ -0,0 +1,138 @@
+package org.apache.fulcrum.security.torque.turbine;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.sql.Connection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.fulcrum.security.model.turbine.entity.TurbineGroup;
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
+import org.apache.fulcrum.security.torque.om.TurbineGroupPeer;
+import org.apache.fulcrum.security.torque.om.TurbineUserGroupRolePeer;
+import
org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity;
+import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
+import org.apache.torque.om.SimpleKey;
+/**
+ * This abstract class provides the SecurityInterface to the managers.
+ *
+ * @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
+ * @version $Id:$
+ */
+public abstract class DefaultAbstractTurbineGroup extends
TorqueAbstractTurbineTurbineSecurityEntity
+ implements TurbineGroup
+{
+ /** Serial version */
+ private static final long serialVersionUID = -6230312046016785990L;
+
+ /**
+ * Forward reference to generated code
+ *
+ * Get a list of association objects, pre-populated with their TurbineRole
+ * objects.
+ *
+ * @param criteria Criteria to define the selection of records
+ * @param con a database connection
+ * @throws TorqueException
+ *
+ * @return a list of User/Group/Role relations
+ */
+ protected List<org.apache.fulcrum.security.torque.om.TurbineUserGroupRole>
getTurbineUserGroupRolesJoinTurbineRole(Criteria criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TurbineUserGroupRolePeer.GROUP_ID, getEntityId() );
+ return TurbineUserGroupRolePeer.doSelectJoinTurbineRole(criteria, con);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
+ */
+ @Override
+ public String getDatabaseName()
+ {
+ return TurbineGroupPeer.DATABASE_NAME;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
+ @Override
+ public void retrieveAttachedObjects(Connection con) throws TorqueException
+ {
+ Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
+
+ List<org.apache.fulcrum.security.torque.om.TurbineUserGroupRole> ugrs
= getTurbineUserGroupRolesJoinTurbineRole(new Criteria(), con);
+
+ for (org.apache.fulcrum.security.torque.om.TurbineUserGroupRole ttugr
: ugrs)
+ {
+ TurbineUserGroupRole ugr = new TurbineUserGroupRole();
+ ugr.setGroup(this);
+ ugr.setRole(ttugr.getTurbineRole());
+ ugr.setUser(ttugr.getTurbineUser(con));
+ userGroupRoleSet.add(ugr);
+ }
+
+ setUserGroupRoleSet(userGroupRoleSet);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ */
+ @Override
+ public void update(Connection con) throws TorqueException
+ {
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
+ if (userGroupRoleSet != null)
+ {
+ Criteria criteria = new Criteria();
+
+ /* remove old entries */
+ criteria.where(TurbineUserGroupRolePeer.GROUP_ID, getEntityId());
+ TurbineUserGroupRolePeer.doDelete(criteria, con);
+
+ for (TurbineUserGroupRole ugr : userGroupRoleSet)
+ {
+ org.apache.fulcrum.security.torque.om.TurbineUserGroupRole
ttugr = new org.apache.fulcrum.security.torque.om.TurbineUserGroupRole();
+ ttugr.setGroupId((Integer)ugr.getGroup().getId());
+ ttugr.setUserId((Integer)ugr.getUser().getId());
+ ttugr.setRoleId((Integer)ugr.getRole().getId());
+ ttugr.save(con);
+ }
+ }
+
+ try
+ {
+ save(con);
+ }
+ catch (Exception e)
+ {
+ throw new TorqueException(e);
+ }
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
+ */
+ @Override
+ public void delete() throws TorqueException
+ {
+ TurbineGroupPeer.doDelete(SimpleKey.keyFor(getEntityId()));
+ }
+}
Propchange:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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=1754910&view=auto
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
(added)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
Tue Aug 2 13:12:05 2016
@@ -0,0 +1,205 @@
+package org.apache.fulcrum.security.torque.turbine;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.sql.Connection;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.fulcrum.security.entity.Role;
+import org.apache.fulcrum.security.model.turbine.entity.TurbinePermission;
+import org.apache.fulcrum.security.torque.om.TurbinePermissionPeer;
+import org.apache.fulcrum.security.torque.om.TurbineRolePermission;
+import org.apache.fulcrum.security.torque.om.TurbineRolePermissionPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
+import org.apache.fulcrum.security.util.RoleSet;
+import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
+import org.apache.torque.om.SimpleKey;
+/**
+ * This abstract class provides the SecurityInterface to the managers.
+ *
+ * @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
+ * @version $Id:$
+ */
+public abstract class DefaultAbstractTurbinePermission extends
TorqueAbstractSecurityEntity
+ implements TurbinePermission
+{
+ /** Serial version */
+ private static final long serialVersionUID = -5313324873688923207L;
+
+ /** a cache of role objects */
+ private Set<Role> roleSet = null;
+
+ /**
+ * Forward reference to generated code
+ *
+ * Get a list of association objects, pre-populated with their TurbineRole
+ * objects.
+ *
+ * @param criteria Criteria to define the selection of records
+ * @param con a database connection
+ * @throws TorqueException
+ *
+ * @return a list of Role/Permission relations
+ */
+ protected List<TurbineRolePermission>
getTurbineRolePermissionsJoinTurbineRole(Criteria criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TurbineRolePermissionPeer.PERMISSION_ID, getEntityId() );
+ return TurbineRolePermissionPeer.doSelectJoinTurbineRole(criteria,
con);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#addRole(org.apache.fulcrum.security.entity.Role)
+ */
+ @Override
+ public void addRole(Role role)
+ {
+ getRoles().add(role);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#getRoles()
+ */
+ @Override
+ public RoleSet getRoles()
+ {
+ if (roleSet == null)
+ {
+ roleSet = new RoleSet();
+ }
+ else if(!(roleSet instanceof RoleSet))
+ {
+ roleSet = new RoleSet(roleSet);
+ }
+
+ return (RoleSet)roleSet;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#getRolesAsSet()
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public <T extends Role> Set<T> getRolesAsSet()
+ {
+ return (Set<T>)roleSet;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#removeRole(org.apache.fulcrum.security.entity.Role)
+ */
+ @Override
+ public void removeRole(Role role)
+ {
+ getRoles().remove(role);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#setRoles(org.apache.fulcrum.security.util.RoleSet)
+ */
+ @Override
+ public void setRoles(RoleSet roleSet)
+ {
+ if (roleSet != null)
+ {
+ this.roleSet = roleSet;
+ }
+ else
+ {
+ this.roleSet = new RoleSet();
+ }
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbinePermission#setRolesAsSet(java.util.Set)
+ */
+ @Override
+ public <T extends Role> void setRolesAsSet(Set<T> roles)
+ {
+ setRoles(new RoleSet(roles));
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
+ */
+ @Override
+ public String getDatabaseName()
+ {
+ return TurbinePermissionPeer.DATABASE_NAME;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
+ @Override
+ public void retrieveAttachedObjects(Connection con) throws
TorqueException
+ {
+ this.roleSet = new RoleSet();
+
+ List<TurbineRolePermission> rolepermissions =
getTurbineRolePermissionsJoinTurbineRole(new Criteria(), con);
+
+ for (TurbineRolePermission ttrp : rolepermissions)
+ {
+ roleSet.add(ttrp.getTurbineRole());
+ }
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ */
+ @Override
+ public void update(Connection con) throws TorqueException
+ {
+ if (roleSet != null)
+ {
+ Criteria criteria = new Criteria();
+
+ /* remove old entries */
+ criteria.where(TurbineRolePermissionPeer.PERMISSION_ID,
getEntityId());
+ TurbineRolePermissionPeer.doDelete(criteria, con);
+
+ for (Role r : roleSet)
+ {
+ TurbineRolePermission rp = new TurbineRolePermission();
+ rp.setRoleId((Integer)r.getId());
+ rp.setPermissionId(getEntityId());
+ rp.save(con);
+ }
+ }
+
+ try
+ {
+ save(con);
+ }
+ catch (Exception e)
+ {
+ throw new TorqueException(e);
+ }
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
+ */
+ @Override
+ public void delete() throws TorqueException
+ {
+ TurbinePermissionPeer.doDelete(SimpleKey.keyFor(getEntityId()));
+ }
+}
Propchange:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbinePermission.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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=1754910&view=auto
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
(added)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
Tue Aug 2 13:12:05 2016
@@ -0,0 +1,261 @@
+package org.apache.fulcrum.security.torque.turbine;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.sql.Connection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.fulcrum.security.entity.Permission;
+import org.apache.fulcrum.security.model.turbine.entity.TurbineRole;
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
+import org.apache.fulcrum.security.torque.om.TurbineRolePeer;
+import org.apache.fulcrum.security.torque.om.TurbineRolePermission;
+import org.apache.fulcrum.security.torque.om.TurbineRolePermissionPeer;
+import org.apache.fulcrum.security.torque.om.TurbineUserGroupRolePeer;
+import
org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity;
+import org.apache.fulcrum.security.util.PermissionSet;
+import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
+import org.apache.torque.om.SimpleKey;
+/**
+ * This abstract class provides the SecurityInterface to the managers.
+ *
+ * @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
+ * @version $Id:$
+ */
+public abstract class DefaultAbstractTurbineRole extends
TorqueAbstractTurbineTurbineSecurityEntity
+ implements TurbineRole
+{
+ /** Serial version */
+ private static final long serialVersionUID = -1782236723198646728L;
+
+ /** a cache of permission objects */
+ private Set<Permission> permissionSet = null;
+
+ /**
+ * Forward reference to generated code
+ *
+ * Get a list of association objects, pre-populated with their
TurbinePermission
+ * objects.
+ *
+ * @param criteria Criteria to define the selection of records
+ * @param con a database connection
+ * @throws TorqueException
+ *
+ * @return a list of Role/Permission relations
+ */
+ protected List<TurbineRolePermission>
getTurbineRolePermissionsJoinTurbinePermission(Criteria criteria, Connection
con)
+ throws TorqueException
+ {
+ criteria.and(TurbineRolePermissionPeer.ROLE_ID, getEntityId() );
+ return
TurbineRolePermissionPeer.doSelectJoinTurbinePermission(criteria, con);
+ }
+
+ /**
+ * Forward reference to generated code
+ *
+ * Get a list of association objects, pre-populated with their TurbineGroup
+ * objects.
+ *
+ * @param criteria Criteria to define the selection of records
+ * @param con a database connection
+ * @throws TorqueException
+ *
+ * @return a list of User/Group/Role relations
+ */
+ protected List<org.apache.fulcrum.security.torque.om.TurbineUserGroupRole>
getTurbineUserGroupRolesJoinTurbineGroup(Criteria criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TurbineUserGroupRolePeer.ROLE_ID, getEntityId() );
+ return TurbineUserGroupRolePeer.doSelectJoinTurbineGroup(criteria,
con);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#addPermission(org.apache.fulcrum.security.entity.Permission)
+ */
+ @Override
+ public void addPermission(Permission permission)
+ {
+ getPermissions().add(permission);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getPermissions()
+ */
+ @Override
+ public PermissionSet getPermissions()
+ {
+ if (permissionSet == null)
+ {
+ permissionSet = new PermissionSet();
+ }
+ else if(!(permissionSet instanceof PermissionSet))
+ {
+ permissionSet = new PermissionSet(permissionSet);
+ }
+
+ return (PermissionSet)permissionSet;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#getPermissionsAsSet()
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public <T extends Permission> Set<T> getPermissionsAsSet()
+ {
+ return (Set<T>)permissionSet;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#removePermission(org.apache.fulcrum.security.entity.Permission)
+ */
+ @Override
+ public void removePermission(Permission permission)
+ {
+ getPermissions().remove(permission);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setPermissions(org.apache.fulcrum.security.util.PermissionSet)
+ */
+ @Override
+ public void setPermissions(PermissionSet permissionSet)
+ {
+ if (permissionSet != null)
+ {
+ this.permissionSet = permissionSet;
+ }
+ else
+ {
+ this.permissionSet = new PermissionSet();
+ }
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineRole#setPermissionsAsSet(java.util.Set)
+ */
+ @Override
+ public <T extends Permission> void setPermissionsAsSet(Set<T>
permissions)
+ {
+ setPermissions(new PermissionSet(permissions));
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
+ */
+ @Override
+ public String getDatabaseName()
+ {
+ return TurbineRolePeer.DATABASE_NAME;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
+ @Override
+ public void retrieveAttachedObjects(Connection con) throws
TorqueException
+ {
+ this.permissionSet = new PermissionSet();
+
+ List<TurbineRolePermission> rolepermissions =
getTurbineRolePermissionsJoinTurbinePermission(new Criteria(), con);
+
+ for (TurbineRolePermission ttrp : rolepermissions)
+ {
+ permissionSet.add(ttrp.getTurbinePermission());
+ }
+
+ Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
+
+ List<org.apache.fulcrum.security.torque.om.TurbineUserGroupRole> ugrs
= getTurbineUserGroupRolesJoinTurbineGroup(new Criteria(), con);
+
+ for (org.apache.fulcrum.security.torque.om.TurbineUserGroupRole ttugr
: ugrs)
+ {
+ TurbineUserGroupRole ugr = new TurbineUserGroupRole();
+ ugr.setRole(this);
+ ugr.setGroup(ttugr.getTurbineGroup());
+ ugr.setUser(ttugr.getTurbineUser(con));
+ userGroupRoleSet.add(ugr);
+ }
+
+ setUserGroupRoleSet(userGroupRoleSet);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ */
+ @Override
+ public void update(Connection con) throws TorqueException
+ {
+ if (permissionSet != null)
+ {
+ Criteria criteria = new Criteria();
+
+ /* remove old entries */
+ criteria.where(TurbineRolePermissionPeer.ROLE_ID, getEntityId());
+ TurbineRolePermissionPeer.doDelete(criteria, con);
+
+ for (Permission p : permissionSet)
+ {
+ TurbineRolePermission rp = new TurbineRolePermission();
+ rp.setPermissionId((Integer)p.getId());
+ rp.setRoleId(getEntityId());
+ rp.save(con);
+ }
+ }
+
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
+ if (userGroupRoleSet != null)
+ {
+ Criteria criteria = new Criteria();
+
+ /* remove old entries */
+ criteria.where(TurbineUserGroupRolePeer.ROLE_ID, getEntityId());
+ TurbineUserGroupRolePeer.doDelete(criteria, con);
+
+ for (TurbineUserGroupRole ugr : userGroupRoleSet)
+ {
+ org.apache.fulcrum.security.torque.om.TurbineUserGroupRole
ttugr = new org.apache.fulcrum.security.torque.om.TurbineUserGroupRole();
+ ttugr.setGroupId((Integer)ugr.getGroup().getId());
+ ttugr.setUserId((Integer)ugr.getUser().getId());
+ ttugr.setRoleId((Integer)ugr.getRole().getId());
+ ttugr.save(con);
+ }
+ }
+
+ try
+ {
+ save(con);
+ }
+ catch (Exception e)
+ {
+ throw new TorqueException(e);
+ }
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
+ */
+ @Override
+ public void delete() throws TorqueException
+ {
+ TurbineRolePeer.doDelete(SimpleKey.keyFor(getEntityId()));
+ }
+}
Propchange:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineRole.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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=1754910&view=auto
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
(added)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
Tue Aug 2 13:12:05 2016
@@ -0,0 +1,141 @@
+package org.apache.fulcrum.security.torque.turbine;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import java.sql.Connection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+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;
+import org.apache.fulcrum.security.torque.om.TurbineUserPeer;
+import
org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity;
+import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
+import org.apache.torque.om.SimpleKey;
+/**
+ * This abstract class provides the SecurityInterface to the managers.
+ *
+ * @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;
+
+ /**
+ * Forward reference to generated code
+ *
+ * Get a list of association objects, pre-populated with their TurbineRole
+ * objects.
+ *
+ * @param criteria Criteria to define the selection of records
+ * @param con a database connection
+ * @throws TorqueException
+ *
+ * @return a list of User/Group/Role relations
+ */
+ protected List<org.apache.fulcrum.security.torque.om.TurbineUserGroupRole>
getTurbineUserGroupRolesJoinTurbineRole(Criteria criteria, Connection con)
+ throws TorqueException
+ {
+ criteria.and(TurbineUserGroupRolePeer.USER_ID, getEntityId() );
+ return TurbineUserGroupRolePeer.doSelectJoinTurbineRole(criteria, con);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
+ */
+ @Override
+ public String getDatabaseName()
+ {
+ return TurbineUserPeer.DATABASE_NAME;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
+ @Override
+ public void retrieveAttachedObjects(Connection con) throws
TorqueException
+ {
+ Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
+
+ List<org.apache.fulcrum.security.torque.om.TurbineUserGroupRole> ugrs
= getTurbineUserGroupRolesJoinTurbineRole(new Criteria(), con);
+
+ for (org.apache.fulcrum.security.torque.om.TurbineUserGroupRole ttugr
: ugrs)
+ {
+ TurbineUserGroupRole ugr = new TurbineUserGroupRole();
+ ugr.setUser(this);
+ ugr.setRole(ttugr.getTurbineRole());
+ // org.apache.fulcrum.security.torque.om.TurbineGroup implements
+ // org.apache.fulcrum.security.model.turbine.entity.TurbineGroup
+ // but may be hides it?
+ ugr.setGroup(ttugr.getTurbineGroup(con));
+ userGroupRoleSet.add(ugr);
+ }
+
+ setUserGroupRoleSet(userGroupRoleSet);
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ */
+ @Override
+ public void update(Connection con) throws TorqueException
+ {
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
+ if (userGroupRoleSet != null)
+ {
+ Criteria criteria = new Criteria();
+
+ /* remove old entries */
+ criteria.where(TurbineUserGroupRolePeer.USER_ID, getEntityId());
+ TurbineUserGroupRolePeer.doDelete(criteria, con);
+
+ for (TurbineUserGroupRole ugr : userGroupRoleSet)
+ {
+ org.apache.fulcrum.security.torque.om.TurbineUserGroupRole
ttugr = new org.apache.fulcrum.security.torque.om.TurbineUserGroupRole();
+ ttugr.setGroupId((Integer)ugr.getGroup().getId());
+ ttugr.setUserId((Integer)ugr.getUser().getId());
+ ttugr.setRoleId((Integer)ugr.getRole().getId());
+ ttugr.save(con);
+ }
+ }
+
+ try
+ {
+ save(con);
+ }
+ catch (Exception e)
+ {
+ throw new TorqueException(e);
+ }
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
+ */
+ @Override
+ public void delete() throws TorqueException
+ {
+ TurbineUserPeer.doDelete(SimpleKey.keyFor(getEntityId()));
+ }
+}
Propchange:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java
(from r1754909,
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/FulcrumAbstractTurbineGroup.java?p2=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineGroup.java&p1=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java&r1=1754909&r2=1754910&rev=1754910&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/FulcrumAbstractTurbineGroup.java
Tue Aug 2 13:12:05 2016
@@ -27,6 +27,7 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
+import
org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
@@ -36,7 +37,7 @@ import org.apache.torque.om.SimpleKey;
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
-public abstract class TorqueAbstractTurbineGroup extends
TorqueAbstractTurbineTurbineSecurityEntity
+public abstract class FulcrumAbstractTurbineGroup extends
TorqueAbstractTurbineTurbineSecurityEntity
implements TurbineGroup
{
/** Serial version */
@@ -62,7 +63,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
*/
@Override
public String getDatabaseName()
@@ -71,7 +72,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
@Override
public void retrieveAttachedObjects(Connection con) throws TorqueException
@@ -93,7 +94,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
@Override
public void update(Connection con) throws TorqueException
@@ -128,7 +129,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
@Override
public void delete() throws TorqueException
Copied:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java
(from r1754909,
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/FulcrumAbstractTurbinePermission.java?p2=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbinePermission.java&p1=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java&r1=1754909&r2=1754910&rev=1754910&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/FulcrumAbstractTurbinePermission.java
Tue Aug 2 13:12:05 2016
@@ -23,10 +23,10 @@ import java.util.Set;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.model.turbine.entity.TurbinePermission;
-import org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermission;
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
+import
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
@@ -37,7 +37,7 @@ import org.apache.torque.om.SimpleKey;
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
-public abstract class TorqueAbstractTurbinePermission extends
TorqueAbstractSecurityEntity
+public abstract class FulcrumAbstractTurbinePermission extends
TorqueAbstractSecurityEntity
implements TurbinePermission
{
/** Serial version */
@@ -131,7 +131,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
{
@@ -139,7 +139,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
@@ -154,7 +154,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
public void update(Connection con) throws TorqueException
{
@@ -186,7 +186,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
Copied:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java
(from r1754909,
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/FulcrumAbstractTurbineRole.java?p2=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/FulcrumAbstractTurbineRole.java&p1=turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java&r1=1754909&r2=1754910&rev=1754910&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/FulcrumAbstractTurbineRole.java
Tue Aug 2 13:12:05 2016
@@ -30,6 +30,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
+import
org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntity;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
@@ -40,7 +41,7 @@ import org.apache.torque.om.SimpleKey;
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:$
*/
-public abstract class TorqueAbstractTurbineRole extends
TorqueAbstractTurbineTurbineSecurityEntity
+public abstract class FulcrumAbstractTurbineRole extends
TorqueAbstractTurbineTurbineSecurityEntity
implements TurbineRole
{
/** Serial version */
@@ -153,7 +154,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#getDatabaseName()
*/
public String getDatabaseName()
{
@@ -161,7 +162,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
*/
public void retrieveAttachedObjects(Connection con) throws TorqueException
{
@@ -191,7 +192,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#update(java.sql.Connection)
*/
public void update(Connection con) throws TorqueException
{
@@ -242,7 +243,7 @@ public abstract class TorqueAbstractTurb
}
/**
- * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ * @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#delete()
*/
public void delete() throws TorqueException
{
