You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2015/02/24 12:21:50 UTC
svn commit: r1661886 -
/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
Author: gk
Date: Tue Feb 24 11:21:50 2015
New Revision: 1661886
URL: http://svn.apache.org/r1661886
Log:
- Remove attribute reference to not yet released torque 4.1 schema.
Modified:
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
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=1661886&r1=1661885&r2=1661886&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml Tue Feb 24 11:21:50 2015
@@ -33,8 +33,11 @@
xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
http://db.apache.org/torque/4.0/templates/database.xsd">
- <table name="FULCRUM_TURBINE_PERMISSION" javaName="TorqueTurbinePermission" idMethod="idbroker" peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer"
- baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbinePermission">
+<!--
+ 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">
<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"/>
@@ -44,7 +47,7 @@
</table>
- <table name="FULCRUM_TURBINE_ROLE" javaName="TorqueTurbineRole" idMethod="idbroker" peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer"
+ <table name="FULCRUM_TURBINE_ROLE" javaName="TorqueTurbineRole" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineRole">
<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"/>
@@ -55,7 +58,7 @@
</table>
- <table name="FULCRUM_TURBINE_GROUP" javaName="TorqueTurbineGroup" idMethod="idbroker" peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer"
+ <table name="FULCRUM_TURBINE_GROUP" javaName="TorqueTurbineGroup" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineGroup">
<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"/>
@@ -66,8 +69,8 @@
</table>
- <table name="FULCRUM_TURBINE_USER" javaName="TorqueTurbineUser" idMethod="idbroker" peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer"
- baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineUser">
+ <table name="FULCRUM_TURBINE_USER" javaName="TorqueTurbineUser" idMethod="idbroker"
+ baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineUser">
<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"/>