henning 2003/01/12 07:11:54
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
Log:
Sync up the Turbine.master and Turbine.properties, add
the security service acl configuration property.
Revision Changes Path
1.27 +34 -17 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TurbineResources.properties 6 Jan 2003 02:53:38 -0000 1.26
+++ TurbineResources.properties 12 Jan 2003 15:11:54 -0000 1.27
@@ -614,6 +614,18 @@
# -------------------------------------------------------------------
#
+# This is the class that implements the UserManager interface to
+# manage User objects. Default is the UserManager from the
+# DBSecurityService.
+# Override this setting if you want your User information stored
+# on a different medium (LDAP directory is a good example).
+#
+# Adjust this setting if you change the Setting of the SecurityService class (see
above).
+
+# Default: org.apache.turbine.services.security.db.DBUserManager
+services.SecurityService.user.manager =
org.apache.turbine.services.security.db.DBUserManager
+
+#
# This is the class that implements the User interface.
# You want to override this setting only if you want your User
# implementation to provide application specific addtional
@@ -623,33 +635,30 @@
#
# Default: org.apache.turbine.om.security.TurbineUser
#
-
services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
#
+# This is the class that implements the ACL interface.
+# You want to override this setting only if you want your ACL
+# implementation to provide application specific addtional
+# functionality.
+#
+
+# Default: org.apache.fulcrum.security.impl.TurbineAccessControlList
+services.SecurityService.acl.class =
org.apache.fulcrum.security.impl.TurbineAccessControlList
+
+#
# This setting is DBSecurityService specific - this class is consulted for the names
# of the columns in the users' tables for the purpose of creating join queries.
# If you use your own User implementation in conjunction with DBSecurityService,
# it's peer class must implement org.apache.turbine.om.security.peer.UserPeer
interface,
# and you need to specify the name of the peer class here.
#
-# Defalut: org.apache.turbine.om.security.peer.TurbineUserPeer
+# Default: org.apache.turbine.om.security.peer.TurbineUserPeer
#
services.SecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
#
-# This is the class that implements UserManager interface.
-# Override this setting if you want your User information stored
-# on a different medium (LDAP directory is a good example).
-# Default implementation uses Peers and a relational database.
-#
-# For LDAP use:
-#
services.SecurityService.user.manager=org.apache.turbine.services.security.ldap.LDAPUserManager
-#
-
-services.SecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
-
-#
# 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.
@@ -672,9 +681,17 @@
services.SecurityService.secure.passwords.algorithm=SHA
-#
# Configuration for the LDAP Security Service implementation
-#
+
+#services.SecurityService.ldap.security.athentication=simple
+#services.SecurityService.ldap.port=<LDAP PORT>
+#services.SecurityService.ldap.host=<LDAP HOST>
+#services.SecurityService.ldap.admin.username=<ADMIN USERNAME>
+#services.SecurityService.ldap.admin.password=<ADMIN PASSWORD>
+#services.SecurityService.ldap.user.basesearch=<SEARCH PATTERN>
+#services.SecurityService.ldap.user.search.filter=<SEARCH FILTER>
+#services.SecurityService.ldap.dn.attribute=userPrincipalName
+#services.SecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
#
# This property specifies the type of security authentication
1.26 +34 -17 jakarta-turbine-2/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/master/TurbineResources.master,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TurbineResources.master 6 Jan 2003 02:53:38 -0000 1.25
+++ TurbineResources.master 12 Jan 2003 15:11:54 -0000 1.26
@@ -614,6 +614,18 @@
# -------------------------------------------------------------------
#
+# This is the class that implements the UserManager interface to
+# manage User objects. Default is the UserManager from the
+# DBSecurityService.
+# Override this setting if you want your User information stored
+# on a different medium (LDAP directory is a good example).
+#
+# Adjust this setting if you change the Setting of the SecurityService class (see
above).
+
+# Default: org.apache.turbine.services.security.db.DBUserManager
+services.SecurityService.user.manager =
org.apache.turbine.services.security.db.DBUserManager
+
+#
# This is the class that implements the User interface.
# You want to override this setting only if you want your User
# implementation to provide application specific addtional
@@ -623,33 +635,30 @@
#
# Default: org.apache.turbine.om.security.TurbineUser
#
-
services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
#
+# This is the class that implements the ACL interface.
+# You want to override this setting only if you want your ACL
+# implementation to provide application specific addtional
+# functionality.
+#
+
+# Default: org.apache.fulcrum.security.impl.TurbineAccessControlList
+services.SecurityService.acl.class =
org.apache.fulcrum.security.impl.TurbineAccessControlList
+
+#
# This setting is DBSecurityService specific - this class is consulted for the names
# of the columns in the users' tables for the purpose of creating join queries.
# If you use your own User implementation in conjunction with DBSecurityService,
# it's peer class must implement org.apache.turbine.om.security.peer.UserPeer
interface,
# and you need to specify the name of the peer class here.
#
-# Defalut: org.apache.turbine.om.security.peer.TurbineUserPeer
+# Default: org.apache.turbine.om.security.peer.TurbineUserPeer
#
services.SecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
#
-# This is the class that implements UserManager interface.
-# Override this setting if you want your User information stored
-# on a different medium (LDAP directory is a good example).
-# Default implementation uses Peers and a relational database.
-#
-# For LDAP use:
-#
services.SecurityService.user.manager=org.apache.turbine.services.security.ldap.LDAPUserManager
-#
-
-services.SecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
-
-#
# 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.
@@ -672,9 +681,17 @@
services.SecurityService.secure.passwords.algorithm=SHA
-#
# Configuration for the LDAP Security Service implementation
-#
+
+#services.SecurityService.ldap.security.athentication=simple
+#services.SecurityService.ldap.port=<LDAP PORT>
+#services.SecurityService.ldap.host=<LDAP HOST>
+#services.SecurityService.ldap.admin.username=<ADMIN USERNAME>
+#services.SecurityService.ldap.admin.password=<ADMIN PASSWORD>
+#services.SecurityService.ldap.user.basesearch=<SEARCH PATTERN>
+#services.SecurityService.ldap.user.search.filter=<SEARCH FILTER>
+#services.SecurityService.ldap.dn.attribute=userPrincipalName
+#services.SecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
#
# This property specifies the type of security authentication
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
