assign OID's to the schema entries, and add schema support for contact

2001-07-10  Chris Toshok  <toshok@ximian.com>

	* backend/pas/evolutionperson.schema: assign OID's to the schema
	entries, and add schema support for contact lists.

svn path=/trunk/; revision=10979

2 files changed, 54 insertions, 24 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 60307ed65c..67fe85a26a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-10  Chris Toshok  <toshok@ximian.com>
+
+	* backend/pas/evolutionperson.schema: assign OID's to the schema
+	entries, and add schema support for contact lists.
+
 2001-07-10  Christopher James Lahey  <clahey@ximian.com>
 
 	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set
diff --git a/addressbook/backend/pas/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema
index abd85fc01c..edd2556796 100644
--- a/addressbook/backend/pas/evolutionperson.schema
+++ b/addressbook/backend/pas/evolutionperson.schema
@@ -10,9 +10,15 @@
 #   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)
 #
 #   The Internet Organizational Person Schema (inetorgperson)
+#
+# OIDs are broken up into the following:
+#   1.3.6.1.4.1.8506.1.?
+#                     .1  Syntaxes
+#                     .2  Attributes
+#                     .3  Objectclasses
    
 # primaryPhone
-attributetype ( 666.666.666.1.1
+attributetype ( 1.3.6.1.4.1.8506.1.2.1
 	NAME 'primaryPhone'
 	DESC 'preferred phone number used to contact a person'
 	EQUALITY caseIgnoreMatch
@@ -21,7 +27,7 @@ attributetype ( 666.666.666.1.1
 	SINGLE-VALUE )
 
 # carPhone
-attributetype ( 666.666.666.1.2
+attributetype ( 1.3.6.1.4.1.8506.1.2.2
 	NAME 'carPhone'
 	DESC 'car phone telephone number of the person'
 	EQUALITY telephoneNumberMatch
@@ -29,130 +35,140 @@ attributetype ( 666.666.666.1.2
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
 	SINGLE-VALUE )
 
-attributetype ( 666.666.666.1.3
+attributetype ( 1.3.6.1.4.1.8506.1.2.3
 	NAME ( 'homeFacsimileTelephoneNumber' 'homeFax' )
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )
 
-attributetype ( 666.666.666.1.4
+attributetype ( 1.3.6.1.4.1.8506.1.2.4
 	NAME 'otherPhone'
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.5
+attributetype ( 1.3.6.1.4.1.8506.1.2.5
 	NAME 'businessRole'
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.6
+attributetype ( 1.3.6.1.4.1.8506.1.2.6
 	NAME 'managerName'
 	SUP name )
 
-attributetype ( 666.666.666.1.7
+attributetype ( 1.3.6.1.4.1.8506.1.2.7
 	NAME 'assistantName'
 	SUP name )
 
 # spouseName
 # single valued (/me smirks)
-attributetype ( 666.666.666.1.8
+attributetype ( 1.3.6.1.4.1.8506.1.2.8
 	NAME 'spouseName'
 	SUP name
 	SINGLE-VALUE )
 
-attributetype ( 666.666.666.1.9
+attributetype ( 1.3.6.1.4.1.8506.1.2.9
 	NAME 'otherPostalAddress'
 	EQUALITY caseIgnoreListMatch
 	SUBSTR caseIgnoreListSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
 
-attributetype ( 666.666.666.1.10
+attributetype ( 1.3.6.1.4.1.8506.1.2.10
 	NAME ( 'mailer' 'mua' )
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32} )
 
-attributetype ( 666.666.666.1.11
+attributetype ( 1.3.6.1.4.1.8506.1.2.11
 	NAME ( 'birthDate' 'dob' )
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 
-attributetype ( 666.666.666.1.12
+attributetype ( 1.3.6.1.4.1.8506.1.2.12
 	NAME 'anniversary'
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 
-attributetype ( 666.666.666.1.13
+attributetype ( 1.3.6.1.4.1.8506.1.2.13
 	NAME 'note'
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
-attributetype ( 666.666.666.1.14
+attributetype ( 1.3.6.1.4.1.8506.1.2.14
 	NAME 'evolutionArbitrary'
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )
 	)
 
-attributetype ( 666.666.666.1.15
+attributetype ( 1.3.6.1.4.1.8506.1.2.15
 	NAME 'fileAs'
 	SUP name )
 
-attributetype ( 666.666.666.1.16
+attributetype ( 1.3.6.1.4.1.8506.1.2.16
 	NAME 'assistantPhone'
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.17
+attributetype ( 1.3.6.1.4.1.8506.1.2.17
 	NAME 'companyPhone'
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.18
+attributetype ( 1.3.6.1.4.1.8506.1.2.18
 	NAME 'callbackPhone'
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.19
+attributetype ( 1.3.6.1.4.1.8506.1.2.19
 	NAME ( 'otherFacsimileTelephoneNumber' 'otherFax' )
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.20
+attributetype ( 1.3.6.1.4.1.8506.1.2.20
 	NAME 'radio'
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.21
+attributetype ( 1.3.6.1.4.1.8506.1.2.21
 	NAME 'telex'
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.22
+attributetype ( 1.3.6.1.4.1.8506.1.2.22
 	NAME 'tty'
 	EQUALITY telephoneNumberMatch
 	SUBSTR telephoneNumberSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 666.666.666.1.23
+attributetype ( 1.3.6.1.4.1.8506.1.2.23
 	NAME 'categories'
 	EQUALITY caseIgnoreMatch
 	SUBSTR caseIgnoreSubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )
 
+attributetype ( 1.3.6.1.4.1.8506.1.2.24
+	NAME 'contact'
+        EQUALITY distinguishedNameMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 1.3.6.1.4.1.8506.1.2.25
+	NAME 'listName'
+	SUP name
+	SINGLE-VALUE )
+
 # evolutionPerson
-objectclass	( 666.666.666.2.1
+objectclass	( 1.3.6.1.4.1.8506.1.3.1
     NAME 'evolutionPerson'
 	DESC 'Objectclass geared to Evolution Usage'
     SUP inetOrgPerson
@@ -164,3 +180,12 @@ objectclass	( 666.666.666.2.1
 		note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $
 		radio $ telex $ tty $ categories )
 	)  
+
+# evolutionPersonList
+objectclass	( 1.3.6.1.4.1.8506.1.3.2
+    NAME 'evolutionPersonList'
+	DESC 'Objectclass geared to Evolution Contact Lists'
+    SUP top
+    STRUCTURAL
+	MUST (
+		listName $ mail $ contact )