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/

Discussion:

Jeffery Painter

2018-01-12 15:00:45 UTC

Permalink

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

Author: gk
Date: Fri Jan 12 14:57:40 2018
New Revision: 1820998
URL: http://svn.apache.org/viewvc?rev=1820998&view=rev
- update required fulcrum security changes
- Menu.vm references missing Flux templates, TODO
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)
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);
}
-
- /**
- */
- 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;
+
+
+/**
+ *
+ * [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;
+
+/**
+ *
+ * [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>
+ 
+ <peerClassName>${package}.om.TurbineUserGroupRolePeerImpl</peerClassName>
+ </userGroupRoleManager>
</userManager>
<groupManager>
<className>${package}.om.TurbineGroup</className>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-***@turbine.apache.org
For additional commands, e-mail: dev-***@turbine.apache.org

Georg Kallidis

2018-01-12 15:13:30 UTC

Permalink

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 <***@jivecast.com>
An: Turbine Developers List <***@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

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)
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
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
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);
}
-
- /**

org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HretrieveAttachedObjects(java.sql.Connection,
, Boolean lazy)

- */
- 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);
- }
}

turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
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;
+
+
+/**
+ *
+ * [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;
+
+
+
+}

turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRole.java
------------------------------------------------------------------------------

svn:eol-style = native

turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
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;

+
+/**
+ *
+ * [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;
+
+
+}

turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserGroupRolePeerImpl.java
------------------------------------------------------------------------------

svn:eol-style = native

turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-schema.xml
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"/>
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
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-***@turbine.apache.org
For additional commands, e-mail: dev-***@turbine.apache.org

Jeffery Painter

2018-01-12 15:15:55 UTC

Permalink

I will start with the webapp and if we want to put it somewhere more
official, we can work on that later.

Thanks!
Jeff

Post by Georg Kallidis
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
Datum: 12.01.2018 16:01
Betreff: Re: svn commit: r1820998 - in
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

---

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);
}
-
- /**

org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity$HretrieveAttachedObjects(java.sql.Connection,
, Boolean lazy)

- */
- public void retrieveAttachedObjects(Connection con,

Boolean lazy) throws TorqueException

- {
- Set<TurbineUserGroupRole> userGroupRoleSet = new

HashSet<TurbineUserGroupRole>();

-
- List<${package}.om.TurbineUserGroupRole> ugrs =

getTurbineUserGroupRoles();

---

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

org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper

+{
+ /** Serial version */
+ private static final long serialVersionUID = 1515767617070L;
+
+
+
+}

svn:eol-style = native

---

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;

svn:eol-style = native

---

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"

---

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

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-***@turbine.apache.org
For additional commands, e-mail: dev-***@turbine.apache.org