You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by qu...@apache.org on 2003/01/17 17:10:58 UTC
cvs commit: jakarta-turbine-2/conf/openldap turbine.ldif turbine.schema
quintonm 2003/01/17 08:10:58
Modified: conf/openldap turbine.ldif turbine.schema
Log:
Patch supplied by hhernandez@itweb.com.mx for Issue #TTWS36
Revision Changes Path
1.2 +30 -10 jakarta-turbine-2/conf/openldap/turbine.ldif
Index: turbine.ldif
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/openldap/turbine.ldif,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- turbine.ldif 31 Dec 2002 12:51:11 -0000 1.1
+++ turbine.ldif 17 Jan 2003 16:10:58 -0000 1.2
@@ -18,33 +18,53 @@
turbineUserMailAddress: hhernandez@itweb.com.mx
userPassword: secreto
+dn: turbinePermissionName=admin,dc=example,dc=com
+objectclass: turbinePermission
+turbinePermissionName: admin
+
+dn: turbinePermissionName=edit,dc=example,dc=com
+objectclass: turbinePermission
+turbinePermissionName: edit
+
+dn: turbinePermissionName=view,dc=example,dc=com
+objectclass: turbinePermission
+turbinePermissionName: view
+
dn: turbineRoleName=root,dc=example,dc=com
objectclass: turbineRole
turbineRoleName: root
-turbinePermission: admin
-turbinePermission: view
+turbinePermissionName: admin
+turbinePermissionName: view
dn: turbineRoleName=editor,dc=example,dc=com
objectclass: turbineRole
turbineRoleName: editor
-turbinePermission: edit
-turbinePermission: view
+turbinePermissionName: edit
+turbinePermissionName: view
+
+dn: turbineGroupName=global,dc=example,dc=com
+objectclass: turbineGroup
+turbineGroupName: global
+
+dn: turbineGroupName=yellow,dc=example,dc=com
+objectclass: turbineGroup
+turbineGroupName: yellow
-dn: turbineGroup=global,turbineUserUniqueId=turbine,dc=example,dc=com
+dn: turbineGroupName=global,turbineUserUniqueId=turbine,dc=example,dc=com
objectclass: turbineUserGroup
turbineUserUniqueId: turbine
-turbineGroup: global
+turbineGroupName: global
turbineRoleName: root
turbineRoleName: editor
-dn: turbineGroup=global,turbineUserUniqueId=hhernandez,dc=example,dc=com
+dn: turbineGroupName=global,turbineUserUniqueId=hhernandez,dc=example,dc=com
objectclass: turbineUserGroup
turbineUserUniqueId: hhernandez
-turbineGroup: global
+turbineGroupName: global
turbineRoleName: editor
-dn: turbineGroup=yellow,turbineUserUniqueId=hhernandez,dc=example,dc=com
+dn: turbineGroupName=yellow,turbineUserUniqueId=hhernandez,dc=example,dc=com
objectclass: turbineUserGroup
turbineUserUniqueId: hhernandez
-turbineGroup: yellow
+turbineGroupName: yellow
turbineRoleName: root
1.2 +30 -23 jakarta-turbine-2/conf/openldap/turbine.schema
Index: turbine.schema
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/openldap/turbine.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- turbine.schema 31 Dec 2002 12:51:11 -0000 1.1
+++ turbine.schema 17 Jan 2003 16:10:58 -0000 1.2
@@ -1,8 +1,3 @@
-attributetype ( 15530.1.1
- NAME 'turbineGroupMember'
- DESC ''
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
attributetype ( 15530.1.2
NAME 'turbineObjectData'
@@ -10,17 +5,11 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40)
attributetype ( 15530.1.3
- NAME 'turbinePermission'
+ NAME 'turbinePermissionName'
DESC ''
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
-attributetype ( 15530.1.4
- NAME 'turbineRoleMember'
- DESC ''
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
-
attributetype ( 15530.1.5
NAME 'turbineUserCreationDate'
DESC ''
@@ -75,7 +64,7 @@
SINGLE-VALUE)
attributetype ( 15530.1.13
- NAME 'turbineGroup'
+ NAME 'turbineGroupName'
DESC ''
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -87,27 +76,45 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
objectclass ( 15530.2.1
+ NAME 'turbineUser'
+ DESC 'Turbine user'
+ SUP top
+ AUXILIARY
+ MUST ( turbineUserUniqueId )
+ MAY ( turbineObjectData $ turbineUserCreationDate $ turbineUserFirstName $
+ turbineUserLastLogon $ turbineUserLastModifiedTime $ turbineUserLastName $
+ turbineUserMailAddress $ userPassword ))
+
+objectclass ( 15530.2.2
NAME 'turbineUserGroup'
DESC 'Turbine User Group '
SUP top
AUXILIARY
- MUST ( turbineUserUniqueId $ turbineGroup )
+ MUST ( turbineUserUniqueId $ turbineGroupName )
MAY ( turbineRoleName $ turbineObjectData ))
-objectclass ( 15530.2.2
+objectclass ( 15530.2.3
+ NAME 'turbineGroup'
+ DESC 'Turbine Group'
+ SUP top
+ AUXILIARY
+ MUST ( turbineGroupName )
+ MAY ( turbineObjectData ))
+
+objectclass ( 15530.2.4
NAME 'turbineRole'
DESC 'Turbine role'
SUP top
AUXILIARY
MUST ( turbineRoleName )
- MAY ( turbineObjectData $ turbinePermission ))
+ MAY ( turbineObjectData $ turbinePermissionName ))
-objectclass ( 15530.2.3
- NAME 'turbineUser'
- DESC 'Turbine user'
+objectclass ( 15530.2.5
+ NAME 'turbinePermission'
+ DESC 'Turbine Permission'
SUP top
AUXILIARY
- MUST ( turbineUserUniqueId )
- MAY ( turbineObjectData $ turbineUserCreationDate $ turbineUserFirstName $
- turbineUserLastLogon $ turbineUserLastModifiedTime $ turbineUserLastName $
- turbineUserMailAddress $ userPassword ))
+ MUST ( turbinePermissionName )
+ MAY ( turbineObjectData ))
+
+
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>