taylor 2002/10/29 11:09:24
Modified: webapp/WEB-INF/conf JetspeedSecurity.default
JetspeedSecurity.template
Log:
cleaning up ant merges on security. I dont agree with this method, but it needs to
be fixed.
Revision Changes Path
1.5 +36 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.default
Index: JetspeedSecurity.default
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.default,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JetspeedSecurity.default 6 Sep 2002 03:29:43 -0000 1.4
+++ JetspeedSecurity.default 29 Oct 2002 19:09:24 -0000 1.5
@@ -7,6 +7,7 @@
# escape the comma (i.e. '\,')
#
# -------------------------------------------------------------------
+services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService
#########################################
# Authentication Service #
@@ -14,6 +15,7 @@
services.PortalAuthentication.classname=org.apache.jetspeed.services.security.turbine.TurbineAuthentication
#services.PortalAuthentication.classname=org.apache.jetspeed.services.security.nosecurity.NoAuthentication
+### LDAP:
services.PortalAuthentication.classname=org.apache.jetspeed.services.security.ldap.LDAPAuthentication
#########################################
# Authorization Service #
@@ -28,32 +30,65 @@
#########################################
services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineUserManagement
+services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser
#services.UserManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoUserManagement
+###
LDAPservices.UserManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPUserManagement
+### LDAP:
services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.ldap.LDAPUser
#########################################
# Role Management Service #
#########################################
services.RoleManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineRoleManagement
+services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.BaseJetspeedRole
#services.RoleManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoRoleManagement
+### LDAP:
services.RoleManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPRoleManagement
+### LDAP:
services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.ldap.LDAPRole
#########################################
# Group Management Service #
#########################################
services.GroupManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineGroupManagement
+services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.BaseJetspeedGroup
#services.GroupManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoGroupManagement
+### LDAP:
services.GroupManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPGroupManagement
+### LDAP:
services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.ldap.LDAPGroup
+
#########################################
# Permission Management Service #
#########################################
services.PermissionManagement.classname=org.apache.jetspeed.services.security.turbine.TurbinePermissionManagement
+services.JetspeedSecurity.permission.class=org.apache.jetspeed.om.security.BaseJetspeedPermission
#services.PermissionManagement.classname=org.apache.jetspeed.services.security.nosecurity.NoPermissionManagement
+### LDAP:
services.PermissionManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPPermissionManagement
#########################################
# Security Cache Service #
#########################################
services.SecurityCache.classname=org.apache.jetspeed.services.security.SecurityCacheImpl
+
+ #########################################
+ # LDAP Service #
+ #########################################
+ services.ldap.classname=org.apache.jetspeed.services.ldap.LDAPService
+ #services.ldap.host=192.168.0.20
+ services.ldap.host=213.194.65.90
+ services.ldap.port=389
+ services.ldap.sslport=636
+ services.ldap.basedn=o/EBIT
+ services.ldap.managerdn=cn/administrator%ou/members%o/EBIT
+ services.ldap.password=password
+ services.ldap.anonymousbind=false
+ services.ldap.securityauthentication=simple
+ #services.ldap.securityprotocol=ssl
+ #services.ldap.socketfactory=javax.net.ssl.SSLSocketFactory
+ #services.ldap.jndiprovider=com.sun.jndi.ldap.LdapCtxFactory
+ #services.ldap.saslclientpckgs=
+ services.ldap.limit=0
+ services.ldap.timeout=0
+ services.ldap.version=3
1.9 +6 -40 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.template
Index: JetspeedSecurity.template
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.template,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JetspeedSecurity.template 29 Oct 2002 18:53:32 -0000 1.8
+++ JetspeedSecurity.template 29 Oct 2002 19:09:24 -0000 1.9
@@ -8,8 +8,6 @@
#
# -------------------------------------------------------------------
services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService
-### LDAP:
services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.ldap.LDAPService
-
#########################################
# Programmatic Cascade Delete Service #
@@ -22,7 +20,6 @@
#########################################
[EMAIL PROTECTED]@
-### LDAP:
services.PortalAuthentication.classname=org.apache.jetspeed.services.security.ldap.LDAPAuthentication
#########################################
# Authorization Service #
@@ -35,29 +32,22 @@
#########################################
[EMAIL PROTECTED]@
-### LDAP:
services.UserManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPUserManagement
-### LDAP:
services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.ldap.LDAPUser
[EMAIL PROTECTED]@
#########################################
# Role Management Service #
#########################################
[EMAIL PROTECTED]@
-services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.BaseJetspeedRole
[EMAIL PROTECTED]@
services.JetspeedSecurity.role.default=user
-### LDAP:
services.RoleManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPRoleManagement
-### LDAP:
services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.ldap.LDAPRole
-
#########################################
# Group Management Service #
#########################################
[EMAIL PROTECTED]@
-services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.BaseJetspeedGroup
-
-### LDAP:
services.GroupManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPGroupManagement
-### LDAP:
services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.ldap.LDAPGroup
[EMAIL PROTECTED]@
#########################################
@@ -65,10 +55,7 @@
#########################################
[EMAIL PROTECTED]@
-services.JetspeedSecurity.permission.class=org.apache.jetspeed.om.security.BaseJetspeedPermission
-
-### LDAP:
services.PermissionManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPPermissionManagement
-
[EMAIL PROTECTED]@
#########################################
# Security Cache Service #
@@ -147,26 +134,5 @@
services.JetspeedSecurity.actions.anon.disable=true
services.JetspeedSecurity.action.allusers.disable=false
-
- #########################################
- # LDAP Service #
- #########################################
- services.ldap.classname=org.apache.jetspeed.services.ldap.LDAPService
- #services.ldap.host=192.168.0.20
- services.ldap.host=213.194.65.90
- services.ldap.port=389
- services.ldap.sslport=636
- services.ldap.basedn=o/EBIT
- services.ldap.managerdn=cn/administrator%ou/members%o/EBIT
- services.ldap.password=password
- services.ldap.anonymousbind=false
- services.ldap.securityauthentication=simple
- #services.ldap.securityprotocol=ssl
- #services.ldap.socketfactory=javax.net.ssl.SSLSocketFactory
- #services.ldap.jndiprovider=com.sun.jndi.ldap.LdapCtxFactory
- #services.ldap.saslclientpckgs=
- services.ldap.limit=0
- services.ldap.timeout=0
- services.ldap.version=3
-
+
--
To unsubscribe, e-mail: <mailto:jetspeed-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@;jakarta.apache.org>
