You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2018/01/12 14:57:40 UTC
svn commit: r1820998 - in
/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main:
java/om/ torque-schema/ webapp/WEB-INF/conf/
Author: gk
Date: Fri Jan 12 14:57:40 2018
New Revision: 1820998
URL: http://svn.apache.org/viewvc?rev=1820998&view=rev
Log:
- update required fulcrum security changes
- Menu.vm references missing Flux templates, TODO
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java (with props)
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java (with props)
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java?rev=1820998&r1=1820997&r2=1820998&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java Fri Jan 12 14:57:40 2018
@@ -75,27 +75,5 @@ public class TurbineUser
setEntityName(v);
}
-
- /**
- * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HretrieveAttachedObjects(java.sql.Connection, , Boolean lazy)
- */
- @Override
- public void retrieveAttachedObjects(Connection con, Boolean lazy) throws TorqueException
- {
- Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
-
- List<${package}.om.TurbineUserGroupRole> ugrs = getTurbineUserGroupRoles();
-
- for (${package}.om.TurbineUserGroupRole ttugr : ugrs)
- {
- TurbineUserGroupRole ugr = new TurbineUserGroupRole();
- ugr.setUser(this);
- ugr.setRole(ttugr.getTurbineRole());
- ugr.setGroup(ttugr.getTurbineGroup(con));
- userGroupRoleSet.add(ugr);
- }
-
- setUserGroupRoleSet(userGroupRoleSet);
- }
}
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java?rev=1820998&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java Fri Jan 12 14:57:40 2018
@@ -0,0 +1,23 @@
+package ${package}.om;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Fri Jan 12 15:33:37 CET 2018]
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements. This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+
+public class TurbineUserGroupRole
+ extends ${package}.om.BaseTurbineUserGroupRole
+ implements org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1515767617070L;
+
+
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java?rev=1820998&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java Fri Jan 12 14:57:40 2018
@@ -0,0 +1,23 @@
+package ${package}.om;
+
+import org.apache.fulcrum.security.torque.peer.TorqueTurbineUserGroupRolePeer;
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Mon Nov 27 14:37:43 CET 2017]
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements. This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+
+public class TurbineUserGroupRolePeerImpl
+ extends ${package}.om.BaseTurbineUserGroupRolePeerImpl
+ implements TorqueTurbineUserGroupRolePeer
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1511789863339L;
+
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml Fri Jan 12 14:57:40 2018
@@ -104,7 +104,7 @@
</table>
- <table name="TURBINE_USER_GROUP_ROLE">
+ <table name="TURBINE_USER_GROUP_ROLE" interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml Fri Jan 12 14:57:40 2018
@@ -130,8 +130,12 @@
-->
<userManager>
- <className>${package}.om.TurbineUser</className>
+ <className>${package}.om.TurbineUser</className>
<peerClassName>${package}.om.TurbineUserPeerImpl</peerClassName>
+ <userGroupRoleManager>
+ <!-- className>org.apache.fulcrum.security.torque.om.TurbineUserGroupRole</className-->
+ <peerClassName>${package}.om.TurbineUserGroupRolePeerImpl</peerClassName>
+ </userGroupRoleManager>
</userManager>
<groupManager>
<className>${package}.om.TurbineGroup</className>
Re: svn commit: r1820998 - in
/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main:
java/om/ torque-schema/ webapp/WEB-INF/conf/
Posted by Jeffery Painter <je...@jivecast.com>.
I will start with the webapp and if we want to put it somewhere more
official, we can work on that later.
Thanks!
Jeff
On 01/12/2018 10:13 AM, Georg Kallidis wrote:
> Hi Jeff,
>
> thanks, this would be excellent! You may integrate in the turbine webapp
> repo? But we could certainly ask Apache Infra to mirror it to Github, but
> then we need to patch. Or we may decide to use a writeable GIT resource,
> then the entire repo would be switched to git.
>
> Till next week, have a good weekend!
>
> Best regards, Georg
>
>
>
> Von: Jeffery Painter <je...@jivecast.com>
> An: Turbine Developers List <de...@turbine.apache.org>
> Datum: 12.01.2018 16:01
> Betreff: Re: svn commit: r1820998 - in
> /turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main:
> java/om/ torque-schema/ webapp/WEB-INF/conf/
>
>
>
> Hi Georg,
>
> I am back now. I can help update the missing Flux template links next
> week for the archetype and finalize the turbine-flux library. Do you
> have a preference of where we could add it to the official svn repo? If
> you can setup the preferred structure, I will do some more testing with
> your updates this week and push the flux code up.
>
> Also happy to just leave it on github if you would rather not mix it in.
> Just let me know.
>
>
> Thanks,
> Jeff
>
>
> On 01/12/2018 09:57 AM, gk@apache.org wrote:
>> Author: gk
>> Date: Fri Jan 12 14:57:40 2018
>> New Revision: 1820998
>>
>> URL: http://svn.apache.org/viewvc?rev=1820998&view=rev
>> Log:
>> - update required fulcrum security changes
>> - Menu.vm references missing Flux templates, TODO
>>
>> Added:
>>
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
> (with props)
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
> (with props)
>> Modified:
>>
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
>> Modified:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
>> URL:
> http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java?rev=1820998&r1=1820997&r2=1820998&view=diff
>
> ==============================================================================
>> ---
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
> (original)
>> +++
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
> Fri Jan 12 14:57:40 2018
>> @@ -75,27 +75,5 @@ public class TurbineUser
>> setEntityName(v);
>>
>> }
>> -
>> - /**
>> - * @see
> org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HretrieveAttachedObjects(java.sql.Connection,
> , Boolean lazy)
>> - */
>> - @Override
>> - public void retrieveAttachedObjects(Connection con,
> Boolean lazy) throws TorqueException
>> - {
>> - Set<TurbineUserGroupRole> userGroupRoleSet = new
> HashSet<TurbineUserGroupRole>();
>> -
>> - List<${package}.om.TurbineUserGroupRole> ugrs =
> getTurbineUserGroupRoles();
>> -
>> - for (${package}.om.TurbineUserGroupRole ttugr : ugrs)
>> - {
>> - TurbineUserGroupRole ugr = new TurbineUserGroupRole();
>> - ugr.setUser(this);
>> - ugr.setRole(ttugr.getTurbineRole());
>> - ugr.setGroup(ttugr.getTurbineGroup(con));
>> - userGroupRoleSet.add(ugr);
>> - }
>> -
>> - setUserGroupRoleSet(userGroupRoleSet);
>> - }
>>
>> }
>>
>> Added:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
>> URL:
> http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java?rev=1820998&view=auto
>
> ==============================================================================
>> ---
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
> (added)
>> +++
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
> Fri Jan 12 14:57:40 2018
>> @@ -0,0 +1,23 @@
>> +package ${package}.om;
>> +
>> +
>> +/**
>> + * The skeleton for this class was autogenerated by Torque on:
>> + *
>> + * [Fri Jan 12 15:33:37 CET 2018]
>> + *
>> + * You should add additional methods to this class to meet the
>> + * application requirements. This class will only be generated as
>> + * long as it does not already exist in the output directory.
>> + */
>> +
>> +public class TurbineUserGroupRole
>> + extends ${package}.om.BaseTurbineUserGroupRole
>> + implements
> org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper
>> +{
>> + /** Serial version */
>> + private static final long serialVersionUID = 1515767617070L;
>> +
>> +
>> +
>> +}
>>
>> Propchange:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Added:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
>> URL:
> http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java?rev=1820998&view=auto
>
> ==============================================================================
>> ---
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
> (added)
>> +++
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
> Fri Jan 12 14:57:40 2018
>> @@ -0,0 +1,23 @@
>> +package ${package}.om;
>> +
>> +import
> org.apache.fulcrum.security.torque.peer.TorqueTurbineUserGroupRolePeer;
>> +
>> +/**
>> + * The skeleton for this class was autogenerated by Torque on:
>> + *
>> + * [Mon Nov 27 14:37:43 CET 2017]
>> + *
>> + * You should add additional methods to this class to meet the
>> + * application requirements. This class will only be generated as
>> + * long as it does not already exist in the output directory.
>> + */
>> +
>> +public class TurbineUserGroupRolePeerImpl
>> + extends ${package}.om.BaseTurbineUserGroupRolePeerImpl
>> + implements TorqueTurbineUserGroupRolePeer
>> +{
>> + /** Serial version */
>> + private static final long serialVersionUID = 1511789863339L;
>> +
>> +
>> +}
>>
>> Propchange:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Modified:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
>> URL:
> http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
>
> ==============================================================================
>> ---
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
> (original)
>> +++
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
> Fri Jan 12 14:57:40 2018
>> @@ -104,7 +104,7 @@
>>
>> </table>
>>
>> - <table name="TURBINE_USER_GROUP_ROLE">
>> + <table name="TURBINE_USER_GROUP_ROLE"
> interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper">
>> <column name="USER_ID" required="true" primaryKey="true"
> type="INTEGER"/>
>> <column name="GROUP_ID" required="true" primaryKey="true"
> type="INTEGER"/>
>> <column name="ROLE_ID" required="true" primaryKey="true"
> type="INTEGER"/>
>> Modified:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
>> URL:
> http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
>
> ==============================================================================
>> ---
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
> (original)
>> +++
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
> Fri Jan 12 14:57:40 2018
>> @@ -130,8 +130,12 @@
>> -->
>>
>> <userManager>
>> - <className>${package}.om.TurbineUser</className>
>> + <className>${package}.om.TurbineUser</className>
>> <peerClassName>${package}.om.TurbineUserPeerImpl</peerClassName>
>> + <userGroupRoleManager>
>> + <!--
> className>org.apache.fulcrum.security.torque.om.TurbineUserGroupRole</className-->
>> +
> <peerClassName>${package}.om.TurbineUserGroupRolePeerImpl</peerClassName>
>> + </userGroupRoleManager>
>> </userManager>
>> <groupManager>
>> <className>${package}.om.TurbineGroup</className>
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@turbine.apache.org
> For additional commands, e-mail: dev-help@turbine.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@turbine.apache.org
For additional commands, e-mail: dev-help@turbine.apache.org
Re: Re: svn commit: r1820998 - in /turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main: java/om/ torque-schema/ webapp/WEB-INF/conf/
Posted by Georg Kallidis <ge...@cedis.fu-berlin.de>.
Hi Jeff,
thanks, this would be excellent! You may integrate in the turbine webapp
repo? But we could certainly ask Apache Infra to mirror it to Github, but
then we need to patch. Or we may decide to use a writeable GIT resource,
then the entire repo would be switched to git.
Till next week, have a good weekend!
Best regards, Georg
Von: Jeffery Painter <je...@jivecast.com>
An: Turbine Developers List <de...@turbine.apache.org>
Datum: 12.01.2018 16:01
Betreff: Re: svn commit: r1820998 - in
/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main:
java/om/ torque-schema/ webapp/WEB-INF/conf/
Hi Georg,
I am back now. I can help update the missing Flux template links next
week for the archetype and finalize the turbine-flux library. Do you
have a preference of where we could add it to the official svn repo? If
you can setup the preferred structure, I will do some more testing with
your updates this week and push the flux code up.
Also happy to just leave it on github if you would rather not mix it in.
Just let me know.
Thanks,
Jeff
On 01/12/2018 09:57 AM, gk@apache.org wrote:
> Author: gk
> Date: Fri Jan 12 14:57:40 2018
> New Revision: 1820998
>
> URL: http://svn.apache.org/viewvc?rev=1820998&view=rev
> Log:
> - update required fulcrum security changes
> - Menu.vm references missing Flux templates, TODO
>
> Added:
>
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
(with props)
>
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
(with props)
> Modified:
>
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
>
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
>
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
>
> Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
> URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java?rev=1820998&r1=1820997&r2=1820998&view=diff
>
==============================================================================
> ---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
(original)
> +++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
Fri Jan 12 14:57:40 2018
> @@ -75,27 +75,5 @@ public class TurbineUser
> setEntityName(v);
>
> }
> -
> - /**
> - * @see
org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HretrieveAttachedObjects(java.sql.Connection,
, Boolean lazy)
> - */
> - @Override
> - public void retrieveAttachedObjects(Connection con,
Boolean lazy) throws TorqueException
> - {
> - Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
> -
> - List<${package}.om.TurbineUserGroupRole> ugrs =
getTurbineUserGroupRoles();
> -
> - for (${package}.om.TurbineUserGroupRole ttugr : ugrs)
> - {
> - TurbineUserGroupRole ugr = new TurbineUserGroupRole();
> - ugr.setUser(this);
> - ugr.setRole(ttugr.getTurbineRole());
> - ugr.setGroup(ttugr.getTurbineGroup(con));
> - userGroupRoleSet.add(ugr);
> - }
> -
> - setUserGroupRoleSet(userGroupRoleSet);
> - }
>
> }
>
> Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
> URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java?rev=1820998&view=auto
>
==============================================================================
> ---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
(added)
> +++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
Fri Jan 12 14:57:40 2018
> @@ -0,0 +1,23 @@
> +package ${package}.om;
> +
> +
> +/**
> + * The skeleton for this class was autogenerated by Torque on:
> + *
> + * [Fri Jan 12 15:33:37 CET 2018]
> + *
> + * You should add additional methods to this class to meet the
> + * application requirements. This class will only be generated as
> + * long as it does not already exist in the output directory.
> + */
> +
> +public class TurbineUserGroupRole
> + extends ${package}.om.BaseTurbineUserGroupRole
> + implements
org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper
> +{
> + /** Serial version */
> + private static final long serialVersionUID = 1515767617070L;
> +
> +
> +
> +}
>
> Propchange:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
>
------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
> URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java?rev=1820998&view=auto
>
==============================================================================
> ---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
(added)
> +++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
Fri Jan 12 14:57:40 2018
> @@ -0,0 +1,23 @@
> +package ${package}.om;
> +
> +import
org.apache.fulcrum.security.torque.peer.TorqueTurbineUserGroupRolePeer;
> +
> +/**
> + * The skeleton for this class was autogenerated by Torque on:
> + *
> + * [Mon Nov 27 14:37:43 CET 2017]
> + *
> + * You should add additional methods to this class to meet the
> + * application requirements. This class will only be generated as
> + * long as it does not already exist in the output directory.
> + */
> +
> +public class TurbineUserGroupRolePeerImpl
> + extends ${package}.om.BaseTurbineUserGroupRolePeerImpl
> + implements TorqueTurbineUserGroupRolePeer
> +{
> + /** Serial version */
> + private static final long serialVersionUID = 1511789863339L;
> +
> +
> +}
>
> Propchange:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
>
------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
> URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
>
==============================================================================
> ---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
(original)
> +++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
Fri Jan 12 14:57:40 2018
> @@ -104,7 +104,7 @@
>
> </table>
>
> - <table name="TURBINE_USER_GROUP_ROLE">
> + <table name="TURBINE_USER_GROUP_ROLE"
interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper">
> <column name="USER_ID" required="true" primaryKey="true"
type="INTEGER"/>
> <column name="GROUP_ID" required="true" primaryKey="true"
type="INTEGER"/>
> <column name="ROLE_ID" required="true" primaryKey="true"
type="INTEGER"/>
>
> Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
> URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
>
==============================================================================
> ---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
(original)
> +++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
Fri Jan 12 14:57:40 2018
> @@ -130,8 +130,12 @@
> -->
>
> <userManager>
> - <className>${package}.om.TurbineUser</className>
> + <className>${package}.om.TurbineUser</className>
> <peerClassName>${package}.om.TurbineUserPeerImpl</peerClassName>
> + <userGroupRoleManager>
> + <!--
className>org.apache.fulcrum.security.torque.om.TurbineUserGroupRole</className-->
> +
<peerClassName>${package}.om.TurbineUserGroupRolePeerImpl</peerClassName>
> + </userGroupRoleManager>
> </userManager>
> <groupManager>
> <className>${package}.om.TurbineGroup</className>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@turbine.apache.org
For additional commands, e-mail: dev-help@turbine.apache.org
Re: svn commit: r1820998 - in
/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main:
java/om/ torque-schema/ webapp/WEB-INF/conf/
Posted by Jeffery Painter <je...@jivecast.com>.
Hi Georg,
I am back now. I can help update the missing Flux template links next
week for the archetype and finalize the turbine-flux library. Do you
have a preference of where we could add it to the official svn repo? If
you can setup the preferred structure, I will do some more testing with
your updates this week and push the flux code up.
Also happy to just leave it on github if you would rather not mix it in.
Just let me know.
Thanks,
Jeff
On 01/12/2018 09:57 AM, gk@apache.org wrote:
> Author: gk
> Date: Fri Jan 12 14:57:40 2018
> New Revision: 1820998
>
> URL: http://svn.apache.org/viewvc?rev=1820998&view=rev
> Log:
> - update required fulcrum security changes
> - Menu.vm references missing Flux templates, TODO
>
> Added:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java (with props)
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java (with props)
> Modified:
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
> turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
>
> Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
> URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java?rev=1820998&r1=1820997&r2=1820998&view=diff
> ==============================================================================
> --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java (original)
> +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java Fri Jan 12 14:57:40 2018
> @@ -75,27 +75,5 @@ public class TurbineUser
> setEntityName(v);
>
> }
> -
> - /**
> - * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HretrieveAttachedObjects(java.sql.Connection, , Boolean lazy)
> - */
> - @Override
> - public void retrieveAttachedObjects(Connection con, Boolean lazy) throws TorqueException
> - {
> - Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
> -
> - List<${package}.om.TurbineUserGroupRole> ugrs = getTurbineUserGroupRoles();
> -
> - for (${package}.om.TurbineUserGroupRole ttugr : ugrs)
> - {
> - TurbineUserGroupRole ugr = new TurbineUserGroupRole();
> - ugr.setUser(this);
> - ugr.setRole(ttugr.getTurbineRole());
> - ugr.setGroup(ttugr.getTurbineGroup(con));
> - userGroupRoleSet.add(ugr);
> - }
> -
> - setUserGroupRoleSet(userGroupRoleSet);
> - }
>
> }
>
> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
> URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java?rev=1820998&view=auto
> ==============================================================================
> --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java (added)
> +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java Fri Jan 12 14:57:40 2018
> @@ -0,0 +1,23 @@
> +package ${package}.om;
> +
> +
> +/**
> + * The skeleton for this class was autogenerated by Torque on:
> + *
> + * [Fri Jan 12 15:33:37 CET 2018]
> + *
> + * You should add additional methods to this class to meet the
> + * application requirements. This class will only be generated as
> + * long as it does not already exist in the output directory.
> + */
> +
> +public class TurbineUserGroupRole
> + extends ${package}.om.BaseTurbineUserGroupRole
> + implements org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper
> +{
> + /** Serial version */
> + private static final long serialVersionUID = 1515767617070L;
> +
> +
> +
> +}
>
> Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
> URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java?rev=1820998&view=auto
> ==============================================================================
> --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java (added)
> +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java Fri Jan 12 14:57:40 2018
> @@ -0,0 +1,23 @@
> +package ${package}.om;
> +
> +import org.apache.fulcrum.security.torque.peer.TorqueTurbineUserGroupRolePeer;
> +
> +/**
> + * The skeleton for this class was autogenerated by Torque on:
> + *
> + * [Mon Nov 27 14:37:43 CET 2017]
> + *
> + * You should add additional methods to this class to meet the
> + * application requirements. This class will only be generated as
> + * long as it does not already exist in the output directory.
> + */
> +
> +public class TurbineUserGroupRolePeerImpl
> + extends ${package}.om.BaseTurbineUserGroupRolePeerImpl
> + implements TorqueTurbineUserGroupRolePeer
> +{
> + /** Serial version */
> + private static final long serialVersionUID = 1511789863339L;
> +
> +
> +}
>
> Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
> URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
> ==============================================================================
> --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml (original)
> +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml Fri Jan 12 14:57:40 2018
> @@ -104,7 +104,7 @@
>
> </table>
>
> - <table name="TURBINE_USER_GROUP_ROLE">
> + <table name="TURBINE_USER_GROUP_ROLE" interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper">
> <column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
> <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
> <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
>
> Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
> URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml?rev=1820998&r1=1820997&r2=1820998&view=diff
> ==============================================================================
> --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml (original)
> +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml Fri Jan 12 14:57:40 2018
> @@ -130,8 +130,12 @@
> -->
>
> <userManager>
> - <className>${package}.om.TurbineUser</className>
> + <className>${package}.om.TurbineUser</className>
> <peerClassName>${package}.om.TurbineUserPeerImpl</peerClassName>
> + <userGroupRoleManager>
> + <!-- className>org.apache.fulcrum.security.torque.om.TurbineUserGroupRole</className-->
> + <peerClassName>${package}.om.TurbineUserGroupRolePeerImpl</peerClassName>
> + </userGroupRoleManager>
> </userManager>
> <groupManager>
> <className>${package}.om.TurbineGroup</className>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@turbine.apache.org
For additional commands, e-mail: dev-help@turbine.apache.org