Author: gk
Date: Fri Apr 17 14:30:24 2015
New Revision: 1674325
URL: http://svn.apache.org/r1674325
Log:
- Cleaned up configuration
- Removed duplicate securityService entries.
- Added jsonrpc service
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
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=1674325&r1=1674324&r2=1674325&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
Fri Apr 17 14:30:24 2015
@@ -349,6 +349,7 @@ services.PullService.classname=org.apach
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
services.UIService.classname = org.apache.turbine.services.ui.TurbineUIService
services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
+services.JsonRpcService.classname=org.apache.turbine.services.jsonrpc.TurbineJsonRpcService
# -------------------------------------------------------------------
#
@@ -617,39 +618,6 @@ 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 = ${package}.om.TurbineUser
-services.SecurityService.group.class = ${package}.om.TurbineGroup
-services.SecurityService.permission.class = ${package}.om.TurbinePermission
-services.SecurityService.role.class = ${package}.om.TurbineRole
-
-services.SecurityService.torque.userPeer.class =
${package}.om.TurbineUserPeer
-services.SecurityService.torque.groupPeer.class =
${package}.om.TurbineGroupPeer
-services.SecurityService.torque.permissionPeer.class =
${package}.om.TurbinePermissionPeer
-services.SecurityService.torque.rolePeer.class =
${package}.om.TurbineRolePeer
-
-# This is the class that implements the ACL interface.
-services.SecurityService.acl.class =
org.apache.turbine.util.security.TurbineAccessControlList
-
-#
-# This is used by the SecurityService to make the password checking
-# secure. When enabled, passwords are transformed by a one-way
-# function into a sequence of bytes that is base64 encoded.
-# It is impossible to guess the plain-text form of the password
-# from the representation. When user logs in, the entered password
-# is transformed the same way and then compared with stored value.
-#
-# Default: false
-#
-services.SecurityService.secure.passwords=false
-
-#
-# This property lets you choose what digest algorithm will be used
-# for encrypting passwords. Check documentation of your JRE for
-# available algorithms.
-#
-# Default: SHA
-#
-services.SecurityService.secure.passwords.algorithm=SHA
# -------------------------------------------------------------------
#
@@ -665,6 +633,13 @@ services.SecurityService.secure.password
#
services.AvalonComponentService.containerConfiguration =
#var("applicationRoot")/WEB-INF/conf/containerConfiguration.xml
services.AvalonComponentService.earlyInit= true
+#
+# Name and location to the configuration file for the component roles.
+#
+#services.AvalonComponentService.componentRoles =
#var("applicationRoot")/WEB-INF/conf/roleConfiguration.xml
+
+#
+#services.AvalonComponentService.componentConfiguration =
/WEB-INF/conf/componentConfiguration.xml
# -------------------------------------------------------------------
#
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=1674325&r1=1674324&r2=1674325&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
Fri Apr 17 14:30:24 2015
@@ -80,6 +80,7 @@
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService"/>
+ <!-- five memory managers : remove later and .. -->
<role
name="org.apache.fulcrum.security.UserManager"
shorthand="userManager"
@@ -115,6 +116,35 @@
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="aclFactory"
default-class="org.apache.fulcrum.security.model.turbine.TurbineACLFactory"/>
+
+ <!-- use torque managers for database mysql et al. -->
+ <!-- <role
+ name="org.apache.fulcrum.security.UserManager"
+ shorthand="userManager"
+ early-init="true"
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineUserManagerImpl"/>
+ <role
+ name="org.apache.fulcrum.security.GroupManager"
+ shorthand="groupManager"
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineGroupManagerImpl"/>
+ <role
+ name="org.apache.fulcrum.security.RoleManager"
+ shorthand="roleManager"
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineRoleManagerImpl"/>
+ <role
+ name="org.apache.fulcrum.security.PermissionManager"
+ shorthand="permissionManager"
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbinePermissionManagerImpl"/>
+ <role
+ name="org.apache.fulcrum.security.ModelManager"
+ shorthand="modelManager"
+
default-class="org.apache.fulcrum.security.torque.turbine.TorqueTurbineModelManagerImpl"/-->
+
+ <!-- role
+ name="org.apache.fulcrum.json.JsonService"
+ shorthand="json"
+
default-class="org.apache.fulcrum.json.jackson.Jackson2MapperService"/-->
<!-- Add your services here -->
+
</role-list>
\ No newline at end of file
