directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r366055 - in /directory/trunk/apacheds: pom.xml src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java src/main/schema/mozilla.schema
Date Thu, 05 Jan 2006 01:55:29 GMT
Author: akarasulu
Date: Wed Jan  4 17:55:22 2006
New Revision: 366055

URL: http://svn.apache.org/viewcvs?rev=366055&view=rev
Log:
added mozilla schema

Added:
    directory/trunk/apacheds/src/main/schema/mozilla.schema   (with props)
Modified:
    directory/trunk/apacheds/pom.xml
    directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java

Modified: directory/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds/pom.xml?rev=366055&r1=366054&r2=366055&view=diff
==============================================================================
--- directory/trunk/apacheds/pom.xml (original)
+++ directory/trunk/apacheds/pom.xml Wed Jan  4 17:55:22 2006
@@ -129,6 +129,13 @@
               <name>system</name>
             </schema>
             <schema>
+              <name>mozilla</name>
+              <dependencies>
+                <dependency>system</dependency>
+                <dependency>core</dependency>
+              </dependencies>
+            </schema>
+            <schema>
               <name>dhcp</name>
               <dependencies>
                 <dependency>system</dependency>

Modified: directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java?rev=366055&r1=366054&r2=366055&view=diff
==============================================================================
--- directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
(original)
+++ directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
Wed Jan  4 17:55:22 2006
@@ -1073,6 +1073,12 @@
             {
                 entryAttr.remove( values.next() );
             }
+            
+            // if nothing is left just remove empty attribute
+            if ( entryAttr.size() == 0 )
+            {
+                entry.remove( entryAttr.getID() );
+            }
         }
 
         // Aliases->single valued comp/partial attr removal is not relevant here

Added: directory/trunk/apacheds/src/main/schema/mozilla.schema
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds/src/main/schema/mozilla.schema?rev=366055&view=auto
==============================================================================
--- directory/trunk/apacheds/src/main/schema/mozilla.schema (added)
+++ directory/trunk/apacheds/src/main/schema/mozilla.schema Wed Jan  4 17:55:22 2006
@@ -0,0 +1,144 @@
+# created mozillaAbPersonObsolete schema
+# from mozillaOrgPerson schema v.0.6
+# for OpenLDAP Directory servers
+#
+# Changes from v.0.6
+# 
+# - Add additional attritute names to match those currently exported 
+#   from mozilla, except for 'mozilla_AimScreenName' which is invalid.
+#   I have found that mozilla does not find them otherwise.
+# - Set both versions of 'nsAIMid' to use the mozilla OID space.
+# - Make 'inetOrgPerson' the SUP for 'mozillaAbPersonObsolete'.
+
+# req. core
+# req. cosine
+# req. inetorgperson
+
+# attribute defs
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.1 
+	NAME ( 'xmozillanickname' 'mozillaNickname' ) 
+	SUP name )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.2 
+	NAME ( 'xmozillausehtmlmail' 'mozillaUseHtmlMail' ) 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.3
+	NAME 'mozillaSecondEmail' 
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.4
+	NAME 'mozillaHomeLocalityName' 
+	EQUALITY caseIgnoreMatch
+	SUBSTR caseIgnoreSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.5 
+	NAME 'mozillaPostalAddress2'
+	EQUALITY caseIgnoreListMatch
+	SUBSTR caseIgnoreListSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.6 
+	NAME 'mozillaHomePostalAddress2'
+	EQUALITY caseIgnoreListMatch
+	SUBSTR caseIgnoreListSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.7 
+	NAME ( 'mozillaHomeState' ) SUP name )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.8 
+	NAME 'mozillaHomePostalCode'
+	EQUALITY caseIgnoreMatch
+	SUBSTR caseIgnoreSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.9 
+	NAME ( 'mozillaHomeCountryName' ) 
+	SUP name SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.10
+	NAME ( 'mozillaHomeFriendlyCountryName' )
+	EQUALITY caseIgnoreMatch
+	SUBSTR caseIgnoreSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.11
+	NAME ( 'homeurl' 'mozillaHomeUrl' )
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.12
+	NAME ( 'workurl' 'mozillaWorkUrl' )
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
+# un-comment for all LDAP server NOT supporting SYNTAX 2.16.840.1.113730.3.7.1
+attributetype ( 1.3.6.1.4.1.13769.2.1.13
+	NAME ( 'nsAIMid' )
+	DESC 'AOL Instant Messenger (AIM) Identity'
+	EQUALITY telephoneNumberMatch
+	SUBSTR telephoneNumberSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
+
+# un-comment for ... LDAP server supporting SYNTAX 2.16.840.1.113730.3.7.1
+#attributetype ( 1.3.6.1.4.1.13769.2.1.13
+#	NAME ( 'nsAIMid' )
+#	DESC 'AOL Instant Messenger (AIM) Identity'
+#	SYNTAX 2.16.840.1.113730.3.7.1 )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.96
+	NAME ( 'custom1' 'mozillaCustom1' )
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.97
+	NAME ( 'custom2' 'mozillaCustom2' )
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.98
+	NAME ( 'custom3' 'mozillaCustom3' )
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.13769.2.1.99
+	NAME ( 'custom4' 'mozillaCustom4' )
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+ 
+
+# objectClass defs 
+
+objectclass ( 1.3.6.1.4.1.13769.2.2.1
+	NAME 'mozillaAbPersonObsolete'
+	SUP inetOrgPerson
+	STRUCTURAL
+	MAY (
+	mozillaNickname $
+	mozillaUseHtmlMail $
+	mozillaSecondEmail $
+	mozillaPostalAddress2 $
+	mozillaHomePostalAddress2 $
+	mozillaHomeLocalityName $
+	mozillaHomeState $
+	mozillaHomePostalCode $
+	mozillaHomeCountryName $
+	mozillaHomeFriendlyCountryName $
+	mozillaHomeUrl $
+	mozillaWorkUrl $
+	mozillaCustom1 $
+	mozillaCustom2 $
+	mozillaCustom3 $
+	mozillaCustom4 $
+	nsAIMid $
+	c $
+	co ) )
+

Propchange: directory/trunk/apacheds/src/main/schema/mozilla.schema
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message