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 2016/11/02 15:23:31 UTC
svn commit: r1767705 [2/2] - in
/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src: changes/
main/resources/archetype-resources/ main/resources/archetype-resources/docs/
main/resources/archetype-resources/docs/sample-mysql-data/
main/resources/arch...
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,121 @@
+package ${package}.modules.actions;
+
+#*
+* 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 org.apache.commons.configuration.Configuration;
+import org.apache.fulcrum.security.util.FulcrumSecurityException;
+import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.annotation.TurbineConfiguration;
+import org.apache.turbine.annotation.TurbineService;
+import org.apache.turbine.modules.Action;
+import org.apache.turbine.om.security.User;
+import org.apache.turbine.pipeline.PipelineData;
+import org.apache.turbine.services.security.SecurityService;
+import org.apache.turbine.util.RunData;
+
+/**
+ * This action removes a user from the session. It makes sure to save
+ * the User object in the session.
+ *
+ * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
+ * @author <a href="mailto:peter@courcoux.biz">Peter Courcoux</a>
+ * @version $Id: LogoutUser.java 1706239 2015-10-01 13:18:35Z tv $
+ */
+public class LogoutUser
+ extends Action
+{
+ /** Injected service instance */
+ @TurbineService
+ private SecurityService security;
+
+ /** Injected configuration instance */
+ @TurbineConfiguration
+ private Configuration conf;
+
+ /**
+ * Clears the PipelineData user object back to an anonymous status not
+ * logged in, and with a null ACL. If the tr.props ACTION_LOGIN
+ * is anything except "LogoutUser", flow is transfered to the
+ * SCREEN_HOMEPAGE
+ *
+ * If this action name is the value of action.logout then we are
+ * being run before the session validator, so we don't need to
+ * set the screen (we assume that the session validator will handle
+ * that). This is basically still here simply to preserve old behaviour
+ * - it is recommended that action.logout is set to "LogoutUser" and
+ * that the session validator does handle setting the screen/template
+ * for a logged out (read not-logged-in) user.
+ *
+ * @param pipelineData Turbine information.
+ * @exception FulcrumSecurityException a problem occurred in the security
+ * service.
+ */
+ @Override
+ public void doPerform(PipelineData pipelineData)
+ throws FulcrumSecurityException
+ {
+ RunData data = getRunData(pipelineData);
+ // Session validator did not run, so RunData is not populated
+ User user = data.getUserFromSession();
+
+ if (!security.isAnonymousUser(user))
+ {
+ // Make sure that the user has really logged in...
+ if (!user.hasLoggedIn())
+ {
+ return;
+ }
+
+ user.setHasLoggedIn(Boolean.FALSE);
+ security.saveUser(user);
+ }
+
+ data.setMessage(conf.getString(TurbineConstants.LOGOUT_MESSAGE));
+
+ // This will cause the acl to be removed from the session in
+ // the Turbine servlet code.
+ data.setACL(null);
+
+ // Retrieve an anonymous user.
+ User anonymousUser = security.getAnonymousUser();
+ data.setUser(anonymousUser);
+ data.save();
+
+ // In the event that the current screen or related navigations
+ // require acl info, we cannot wait for Turbine to handle
+ // regenerating acl.
+ data.getSession().removeAttribute(TurbineConstants.ACL_SESSION_KEY);
+
+ // If this action name is the value of action.logout then we are
+ // being run before the session validator, so we don't need to
+ // set the screen (we assume that the session validator will handle
+ // that). This is basically still here simply to preserve old behavior
+ // - it is recommended that action.logout is set to "LogoutUser" and
+ // that the session validator does handle setting the screen/template
+ // for a logged out (read not-logged-in) user.
+ if (!conf.getString(TurbineConstants.ACTION_LOGOUT_KEY,
+ TurbineConstants.ACTION_LOGOUT_DEFAULT)
+ .equals(TurbineConstants.ACTION_LOGOUT_DEFAULT))
+ {
+ data.setScreen(conf.getString(TurbineConstants.SCREEN_HOMEPAGE));
+ }
+ }
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/LogoutUser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/SecureAction.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/SecureAction.java?rev=1767705&r1=1767704&r2=1767705&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/SecureAction.java (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/modules/actions/SecureAction.java Wed Nov 2 15:23:30 2016
@@ -58,7 +58,7 @@ public class SecureAction extends Veloci
// Get the Turbine ACL implementation
TurbineAccessControlListImpl acl = (TurbineAccessControlListImpl) getRunData(data).getACL();
- if (acl == null || !acl.hasRole("TurbineAdmin")) {
+ if (acl == null || !acl.hasRole("turbineadmin")) {
getRunData(data).setMessage("You do not have permission to access this action");
isAuthorized = false;
} else if (acl.hasRole("admin")) {
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,89 @@
+package ${package}.om;
+
+import org.apache.torque.TorqueException;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * 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.
+ */
+/**
+ * Added Interface and default implementations
+ * @author gk
+ *
+ */
+public class TurbineGroup
+ extends ${package}.om.BaseTurbineGroup implements org.apache.fulcrum.security.entity.Group, org.apache.fulcrum.security.model.turbine.entity.TurbineGroup
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1477403437121L;
+
+ /**
+ * Get the value of id.
+ *
+ * @return Object
+ */
+ @Override
+ public Object getId()
+ {
+
+ return getGroupId();
+ }
+
+ /**
+ * Set the value of id.
+ *
+ * @param v new value
+ */
+ @Override
+ public void setId(Object v)
+ {
+ setGroupId( (Integer)v);
+
+ }
+
+ /**
+ * Get the value of name.
+ *
+ * @return String
+ */
+ @Override
+ public String getName()
+ {
+
+ return getEntityName();
+ }
+
+ /**
+ * Set the value of name.
+ *
+ * @param v new value
+ */
+ @Override
+ public void setName(String v)
+ {
+ setEntityName(v);
+ }
+
+ @Override
+ public Integer getEntityId() {
+ return getGroupId();
+ }
+
+ @Override
+ public void setEntityId(Integer id) throws TorqueException {
+ setGroupId(id);
+ }
+
+ @Override
+ public String getDatabaseName()
+ {
+ return "default";
+ }
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeer.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeer.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeer.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeer.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,21 @@
+package ${package}.om;
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * This class provides static wrappers for the peer implementation classes.
+ * This class will only be generated as long as it does not already exist
+ * in the output directory.
+ */
+/**
+ * Added Interface
+ * @author gk
+ *
+ */
+public class TurbineGroupPeer
+ extends ${package}.om.BaseTurbineGroupPeer implements org.apache.fulcrum.security.torque.peer.Peer
+{
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeerImpl.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeerImpl.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeerImpl.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeerImpl.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,25 @@
+package ${package}.om;
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:38 CEST 2016]
+ *
+ * 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.
+ */
+/**
+ * Added Interface
+ * @author gk
+ *
+ */
+public class TurbineGroupPeerImpl
+ extends ${package}.om.BaseTurbineGroupPeerImpl implements org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer<TurbineGroup>
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1477403438057L;
+
+
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineGroupPeerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermission.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermission.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermission.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermission.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,60 @@
+package ${package}.om;
+
+import org.apache.torque.TorqueException;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * 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.
+ */
+/**
+ * Added Interface and default implementations
+ * @author gk
+ *
+ */
+public class TurbinePermission
+ extends ${package}.om.BaseTurbinePermission implements org.apache.fulcrum.security.entity.Permission, org.apache.fulcrum.security.model.turbine.entity.TurbinePermission
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1477403437105L;
+
+ @Override
+ public Integer getEntityId() {
+ return getPermissionId();
+ }
+
+ @Override
+ public void setEntityId(Integer id) throws TorqueException {
+ setPermissionId(id);
+ }
+
+ /**
+ * Get the value of name.
+ *
+ * @return String
+ */
+ @Override
+ public String getName()
+ {
+
+ return getEntityName();
+ }
+
+ /**
+ * Set the value of name.
+ *
+ * @param v new value
+ */
+ @Override
+ public void setName(String v)
+ {
+ setEntityName(v);
+
+ }
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbinePermission.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,99 @@
+package ${package}.om;
+
+import java.sql.Connection;
+import java.util.Set;
+
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
+import org.apache.torque.TorqueException;
+import org.apache.torque.om.SimpleKey;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * 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.
+ */
+/**
+ * Added Interface and default implementations
+ * @author gk
+ *
+ */
+public class TurbineRole
+ extends ${package}.om.BaseTurbineRole implements org.apache.fulcrum.security.entity.Role, org.apache.fulcrum.security.model.turbine.entity.TurbineRole
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1477403437121L;
+
+
+ /**
+ * Get the value of name.
+ *
+ * @return String
+ */
+ @Override
+ public String getName()
+ {
+
+ return getEntityName();
+ }
+
+ /**
+ * Set the value of name.
+ *
+ * @param v new value
+ */
+ @Override
+ public void setName(String v)
+ {
+ setEntityName(v);
+
+ }
+
+ @Override
+ public Integer getEntityId() {
+ return getRoleId();
+ }
+
+ @Override
+ public void setEntityId(Integer id) throws TorqueException {
+ setRoleId(id);
+ }
+
+ /**
+ * @TODO
+ */
+ @Override
+ public void update(Connection con) throws TorqueException {
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
+ if (userGroupRoleSet != null)
+ {
+
+
+ }
+
+ try
+ {
+ save(con);
+ }
+ catch (Exception e)
+ {
+ throw new TorqueException(e);
+ }
+ }
+
+ @Override
+ public String getDatabaseName() {
+ return "default";
+ }
+
+ @Override
+ public void delete() throws TorqueException {
+ TurbineRolePeer.doDelete(SimpleKey.keyFor(getEntityId()));
+
+ }
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRole.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeer.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeer.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeer.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeer.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,21 @@
+package ${package}.om;
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * This class provides static wrappers for the peer implementation classes.
+ * This class will only be generated as long as it does not already exist
+ * in the output directory.
+ */
+/**
+ * Added Interface
+ * @author gk
+ *
+ */
+public class TurbineRolePeer
+ extends ${package}.om.BaseTurbineRolePeer implements org.apache.fulcrum.security.torque.peer.Peer
+{
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeerImpl.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeerImpl.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeerImpl.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeerImpl.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,27 @@
+package ${package}.om;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:38 CEST 2016]
+ *
+ * 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.
+ */
+/**
+ * Added Interface
+ * @author gk
+ *
+ */
+public class TurbineRolePeerImpl
+ extends ${package}.om.BaseTurbineRolePeerImpl implements org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer<TurbineRole>
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1477403438057L;
+
+
+
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePeerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePermission.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePermission.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePermission.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePermission.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,25 @@
+package ${package}.om;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * 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 TurbineRolePermission
+ extends ${package}.om.BaseTurbineRolePermission
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineRolePermission.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,149 @@
+package ${package}.om;
+
+import java.sql.Connection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
+import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
+import org.apache.torque.om.SimpleKey;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * 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.
+ */
+/**
+ * Added Interface
+ * @author gk
+ *
+ */
+public class TurbineUser
+ extends ${package}.om.BaseTurbineUser implements org.apache.fulcrum.security.model.turbine.entity.TurbineUser
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1477403437136L;
+
+ /**
+ * Get the value of id.
+ *
+ * @return Object
+ */
+ @Override
+ public Object getId()
+ {
+
+ return getEntityId();
+ }
+
+ /**
+ * Set the value of id.
+ *
+ * @param v new value
+ */
+ @Override
+ public void setId(Object v)
+ {
+ setEntityId( (Integer) v);
+
+ }
+
+ /**
+ * Get the value of name.
+ *
+ * @return String
+ */
+ @Override
+ public String getName()
+ {
+
+ return getEntityName();
+ }
+
+ /**
+ * Set the value of name.
+ *
+ * @param v new value
+ */
+ @Override
+ public void setName(String v)
+ {
+ setEntityName(v);
+
+ }
+
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#getDatabaseName()
+ */
+ @Override
+ public String getDatabaseName()
+ {
+ return "default";
+ }
+
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection)
+ */
+ @Override
+ public void retrieveAttachedObjects(Connection con) throws TorqueException
+ {
+ Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
+
+ List<${package}.om.TurbineUserGroupRole> ugrs = getTurbineUserGroupRolesJoinTurbineUser(new Criteria(), con);
+
+ 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);
+ }
+
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#update(java.sql.Connection)
+ *
+ * @TODO
+ */
+ @Override
+ public void update(Connection con) throws TorqueException
+ {
+ Set<TurbineUserGroupRole> userGroupRoleSet = getUserGroupRoleSet();
+ if (userGroupRoleSet != null)
+ {
+
+
+ }
+
+ try
+ {
+ save(con);
+ }
+ catch (Exception e)
+ {
+ throw new TorqueException(e);
+ }
+ }
+
+ /**
+ * @see org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity#delete()
+ */
+ @Override
+ public void delete() throws TorqueException
+ {
+ TurbineUserPeer.doDelete(SimpleKey.keyFor(getEntityId()));
+ }
+
+
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUser.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeer.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeer.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeer.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeer.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,22 @@
+package ${package}.om;
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:37 CEST 2016]
+ *
+ * This class provides static wrappers for the peer implementation classes.
+ * This class will only be generated as long as it does not already exist
+ * in the output directory.
+ */
+/**
+ * Added Interface
+ * @author gk
+ *
+ */
+
+public class TurbineUserPeer
+ extends ${package}.om.BaseTurbineUserPeer implements org.apache.fulcrum.security.torque.peer.Peer
+{
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeerImpl.java
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeerImpl.java?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeerImpl.java (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeerImpl.java Wed Nov 2 15:23:30 2016
@@ -0,0 +1,25 @@
+package ${package}.om;
+
+
+/**
+ * The skeleton for this class was autogenerated by Torque on:
+ *
+ * [Tue Oct 25 15:50:38 CEST 2016]
+ *
+ * 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.
+ */
+
+/**
+ * Added Interface
+ * @author gk
+ *
+ */
+public class TurbineUserPeerImpl
+ extends ${package}.om.BaseTurbineUserPeerImpl implements org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer<TurbineUser>
+{
+ /** Serial version */
+ private static final long serialVersionUID = 1477403438057L;
+
+}
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/java/om/TurbineUserPeerImpl.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-data.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-data.xml?rev=1767705&r1=1767704&r2=1767705&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/torque-schema/torque-security-data.xml Wed Nov 2 15:23:30 2016
@@ -43,13 +43,13 @@
<!-- Turbine Permissions -->
- <TurbinePermission PermissionId="1" Name="TurbineAdmin"/>
- <TurbinePermission PermissionId="2" Name="Turbine"/>
+ <TurbinePermission PermissionId="1" Name="turbineadmin"/>
+ <TurbinePermission PermissionId="2" Name="turbine"/>
<!-- Turbine Roles -->
- <TurbineRole RoleId="1" Name="TurbineAdmin"/>
- <TurbineRole RoleId="2" Name="TurbineUser"/>
+ <TurbineRole RoleId="1" Name="turbineadmin"/>
+ <TurbineRole RoleId="2" Name="turbineuser"/>
<!-- Turbine Groups -->
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=1767705&r1=1767704&r2=1767705&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 Wed Nov 2 15:23:30 2016
@@ -32,12 +32,12 @@
xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
http://db.apache.org/torque/4.0/templates/database-strict.xsd"
name="${turbine_database_name}"
- defaultIdMethod="native">
+ defaultIdMethod="idbroker">
- <table name="TURBINE_PERMISSION" idMethod="idbroker">
- <column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR" javaName="Name"/>
+ <table name="TURBINE_PERMISSION" idMethod="idbroker" baseClass="${package}.fulcrum.security.torque.turbine.TorqueAbstractTurbinePermission">
+ <column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER" javaType="object"/>
+ <column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR" javaName="EntityName"/>
<unique>
<unique-column name="PERMISSION_NAME"/>
@@ -45,9 +45,9 @@
</table>
- <table name="TURBINE_ROLE" idMethod="idbroker">
- <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="ROLE_NAME" required="true" size="64" type="VARCHAR" javaName="Name"/>
+ <table name="TURBINE_ROLE" idMethod="idbroker" baseClass="${package}.fulcrum.security.torque.turbine.TorqueAbstractTurbineRole">
+ <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER" javaType="object"/>
+ <column name="ROLE_NAME" required="true" size="64" type="VARCHAR" javaName="EntityName"/>
<unique>
<unique-column name="ROLE_NAME"/>
@@ -55,9 +55,9 @@
</table>
- <table name="TURBINE_GROUP" idMethod="idbroker">
- <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="GROUP_NAME" required="true" type="VARCHAR" size="64" javaName="Name"/>
+ <table name="TURBINE_GROUP" idMethod="idbroker" baseClass="${package}.fulcrum.security.torque.turbine.TorqueAbstractTurbineGroup">
+ <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER" javaType="object"/>
+ <column name="GROUP_NAME" required="true" type="VARCHAR" size="64" javaName="EntityName"/>
<unique>
<unique-column name="GROUP_NAME"/>
@@ -78,9 +78,11 @@
</foreign-key>
</table>
- <table name="TURBINE_USER" idMethod="idbroker">
- <column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="LOGIN_NAME" required="true" size="64" type="VARCHAR" javaName="UserName"/>
+ <!-- org.apache.fulcrum.security.torque.TorqueAbstractSecurityEntity -->
+ <table name="TURBINE_USER" idMethod="idbroker" baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbineTurbineSecurityEntity"
+ interface="org.apache.fulcrum.security.model.turbine.entity.TurbineUser">
+ <column name="USER_ID" required="true" primaryKey="true" type="INTEGER" javaType="object" javaName="EntityId"/>
+ <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" required="true" size="64" type="VARCHAR"/>
<column name="LAST_NAME" required="true" size="64" type="VARCHAR"/>
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties
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/Torque.properties?rev=1767705&r1=1767704&r2=1767705&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/Torque.properties Wed Nov 2 15:23:30 2016
@@ -35,13 +35,15 @@
# configure these properly.
# -------------------------------------------------------------------
+
+
#
# For JNDI configuration please see: https://db.apache.org/torque/torque-4.0/documentation/orm-reference/initialisation-configuration.html
#
#
-torque.dsfactory.${turbine_database_name}.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
-torque.dsfactory.${turbine_database_name}.jndi.path=${turbine_database_jndipath}
-torque.dsfactory.${turbine_database_name}.jndi.ttl=300000
+#torque.dsfactory.${turbine_database_name}.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.${turbine_database_name}.jndi.path=${turbine_database_jndipath}
+#torque.dsfactory.${turbine_database_name}.jndi.ttl=300000
# -------------------------------------------------------------------
#
@@ -49,9 +51,9 @@ torque.dsfactory.${turbine_database_name
#
# -------------------------------------------------------------------
#torque.database.default=${turbine_database_name}
-#torque.database.${turbine_database_name}.adapter=${turbine_database_adapter}
-#torque.database.${turbine_database_name}.user=${turbine_database_user}
-#torque.database.${turbine_database_name}.password=${turbine_database_password}
+torque.database.${turbine_database_name}.adapter=${turbine_database_adapter}
+torque.database.${turbine_database_name}.user=${turbine_database_user}
+torque.database.${turbine_database_name}.password=${turbine_database_password}
#
#torque.defaults.pool.maxActive = 30
#torque.defaults.pool.testOnBorrow = true
@@ -62,11 +64,11 @@ torque.dsfactory.${turbine_database_name
#torque.defaults.connection.user = ${turbine_database_user}
#torque.defaults.connection.password = ${turbine_database_password}
#
-#torque.dsfactory.${turbine_database_name}.connection.driver = ${turbine_database_driver}
-#torque.dsfactory.${turbine_database_name}.connection.url = ${turbine_database_url}${turbine_database_name}
-#torque.dsfactory.${turbine_database_name}.connection.user = ${turbine_database_user}
-#torque.dsfactory.${turbine_database_name}.connection.password = ${turbine_database_password}
-#torque.dsfactory.${turbine_database_name}.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.${turbine_database_name}.connection.driver = ${turbine_database_driver}
+torque.dsfactory.${turbine_database_name}.connection.url = ${turbine_database_url}${turbine_database_name}
+torque.dsfactory.${turbine_database_name}.connection.user = ${turbine_database_user}
+torque.dsfactory.${turbine_database_name}.connection.password = ${turbine_database_password}
+torque.dsfactory.${turbine_database_name}.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
# -------------------------------------------------------------------
# Determines if the quantity column of the IDBroker's id_table should
@@ -114,8 +116,8 @@ torque.idbroker.initialIdStep = 500
# should be set to false.
torque.idbroker.usenewconnection = true
-# Uncomment if using shared data source factory
-#torque.database.default=${turbine_database_name}
+# Comment if not using shared data source factory
+torque.database.default=${turbine_database_name}
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
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/TurbineResources.properties?rev=1767705&r1=1767704&r2=1767705&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties Wed Nov 2 15:23:30 2016
@@ -152,7 +152,7 @@ module.packages=${package}.modules,org.a
template.homepage=Index.vm
-# This is the default screen to show to people when they first access
+template.home=Index.vm# This is the default screen to show to people when they first access
# the system. This is only used if there is no value for
# template.homepage. This is for use when you are not using a
# templating system such as Velocity or JSP.
@@ -615,6 +615,9 @@ services.SchedulerService.earlyInit=true
services.SecurityService.classname=org.apache.turbine.services.security.DefaultSecurityService
services.SecurityService.user.manager = org.apache.turbine.services.security.DefaultUserManager
+services.SecurityService.user.class=org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl
+
+
# -------------------------------------------------------------------
#
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=1767705&r1=1767704&r2=1767705&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 Wed Nov 2 15:23:30 2016
@@ -57,9 +57,15 @@
<modelManager/>
<aclFactory/>
- <!-- More Fulcrum Components, e.g. json, XmlRpcServerComponent, cft. Fulcrum Component Configurations
+ <!--
+ Fulcrum Components, e.g. json, XmlRpcServerComponent, cft. Fulcrum Component Configurations
+ -->
+
+
+ <!--
+ Pure Fulcrum Model
-->
-
+ <!--
<userManager>
<className>org.apache.fulcrum.security.torque.om.TorqueTurbineUser</className>
</userManager>
@@ -72,9 +78,10 @@
<permissionManager>
<className>org.apache.fulcrum.security.torque.om.TorqueTurbinePermission</className>
</permissionManager>
+ -->
<!--
- default classes implementing org.apache.fulcrum.security.model.turbine.entity interfaces
+ Default classes implementing org.apache.fulcrum.security.model.turbine.entity interfaces
-->
<!--userManager>
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl</className>
@@ -91,17 +98,17 @@
<!--
Custom Turbine ORM Torque classes could not yet be used:
- - requires Torque 4.1
+ - requires Torque 4.1 or if using Torque 4.0 reqires manually adding the interfaces in T-classes
- requires attribute baseClass in fulcrum-turbine-schema.xml table elements set to appropriate org.apache.fulcrum.security.model.turbine.entity interfaces
- requires attribute peerClass in fulcrum-turbine-schema.xml table elements set to org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer
-->
- <!--
+
<userManager>
<className>${package}.om.TurbineUser</className>
- <peerClassName>${package}.om.TurbineUserPeer</peerClassName>
+ <peerClassName>${package}.om.TurbineUserPeerImpl</peerClassName>
</userManager>
<groupManager>
- <className>${package}.om.TorqueTurbineGroup</className>
+ <className>${package}.om.TurbineGroup</className>
<peerClassName>${package}.om.TurbineGroupPeerImpl</peerClassName>
</groupManager>
<roleManager>
@@ -113,5 +120,5 @@
<peerClassName>${package}.om.TurbinePermissionPeerImpl</peerClassName>
</permissionManager>
<peerManager/>
- -->
+
</componentConfig>
\ No newline at end of file
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/log4j.properties
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/log4j.properties?rev=1767705&r1=1767704&r2=1767705&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/log4j.properties (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/log4j.properties Wed Nov 2 15:23:30 2016
@@ -23,7 +23,7 @@
# If we don't know the logging facility, put it into the
# turbine.log
#
-log4j.rootLogger = INFO, app
+log4j.rootLogger = INFO, app, console
#
# App log
@@ -45,13 +45,13 @@ log4j.additivity.scheduler = false
#
# sql log
-#
+# allows TRACE
log4j.logger.org.apache.torque.util = DEBUG, sql, console
log4j.additivity.org.apache.torque.util = false
#
# Torque log
-#
+# allows TRACE
log4j.logger.org.apache.torque = DEBUG, torque
log4j.additivity.org.apache.torque = false
@@ -111,7 +111,7 @@ log4j.appender.sql.append = true
#
log4j.appender.console = org.apache.log4j.ConsoleAppender
log4j.appender.console.layout = org.apache.log4j.PatternLayout
-log4j.appender.console.layout.conversionPattern = %d [%t] %-5p - %m%n
+log4j.appender.console.layout.conversionPattern = %d [%t] %-5p %C{1} - %m%n
#
# torque.log
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.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/roleConfiguration.xml?rev=1767705&r1=1767704&r2=1767705&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml Wed Nov 2 15:23:30 2016
@@ -81,7 +81,34 @@
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService"/>
- <!-- five memory managers : remove later and .. -->
+ <role
+ name="org.apache.fulcrum.security.UserManager"
+ shorthand="userManager"
+ early-init="true"
+ default-class="${package}.fulcrum.security.torque.turbine.TorqueTurbineUserManagerImpl"/>
+
+ <role
+ name="org.apache.fulcrum.security.GroupManager"
+ shorthand="groupManager"
+ default-class="${package}.fulcrum.security.torque.turbine.TorqueTurbineGroupManagerImpl"/>
+
+ <role
+ name="org.apache.fulcrum.security.RoleManager"
+ shorthand="roleManager"
+ default-class="${package}.fulcrum.security.torque.turbine.TorqueTurbineRoleManagerImpl"/>
+
+ <role
+ name="org.apache.fulcrum.security.PermissionManager"
+ shorthand="permissionManager"
+ default-class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl"/>
+
+ <role
+ name="org.apache.fulcrum.security.torque.peer.PeerManager"
+ shorthand="peerManager"
+ default-class="org.apache.fulcrum.security.torque.peer.PeerManagerDefaultImpl"/>
+
+ <!-- optionally five memory managers : remove later and .. -->
+ <!--
<role
name="org.apache.fulcrum.security.UserManager"
shorthand="userManager"
@@ -102,6 +129,7 @@
name="org.apache.fulcrum.security.PermissionManager"
shorthand="permissionManager"
default-class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl"/>
+ -->
<role
name="org.apache.fulcrum.security.ModelManager"
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Error.vm
URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Error.vm?rev=1767705&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Error.vm (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Error.vm Wed Nov 2 15:23:30 2016
@@ -0,0 +1,7 @@
+E R R O R
+
+$message
+
+$error
+
+$exception
\ No newline at end of file
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Error.vm
------------------------------------------------------------------------------
svn:eol-style = native