You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/10/06 10:39:08 UTC
svn commit: r822166 - in /directory/studio/trunk:
ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/
ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/
Author: seelmann
Date: Tue Oct 6 08:39:07 2009
New Revision: 822166
URL: http://svn.apache.org/viewvc?rev=822166&view=rev
Log:
DIRSTUDIO-555 (Human readable descriptions of OIDs in binary attributes preference page):
o Added lookup to OIDDescriptions.properties in preference page
o added multiple OID descriptions
o added apache license header
Modified:
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/OIDDescriptions.properties
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java?rev=822166&r1=822165&r2=822166&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java Tue Oct 6 08:39:07 2009
@@ -38,6 +38,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.schema.BinarySyntax;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -500,6 +501,10 @@
.get( attribute.getAttributeNumericOidOrName() );
return SchemaUtils.toString( atd );
}
+ else if ( Utils.getOidDescription( attribute.getAttributeNumericOidOrName() ) != null )
+ {
+ return Utils.getOidDescription( attribute.getAttributeNumericOidOrName() );
+ }
}
}
}
@@ -534,6 +539,10 @@
.getSyntaxNumericOid() );
return SchemaUtils.toString( lsd );
}
+ else if ( Utils.getOidDescription( syntax.getSyntaxNumericOid() ) != null )
+ {
+ return Utils.getOidDescription( syntax.getSyntaxNumericOid() );
+ }
}
}
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/OIDDescriptions.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/OIDDescriptions.properties?rev=822166&r1=822165&r2=822166&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/OIDDescriptions.properties (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/OIDDescriptions.properties Tue Oct 6 08:39:07 2009
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
# Sources:
# http://www.iana.org/assignments/ldap-parameters
# http://www.alvestrand.no/objectid/top.html
@@ -353,4 +371,199 @@
1.3.6.1.4.1.1466.115.121.1.56=LDAP Schema Definition
1.3.6.1.4.1.1466.115.121.1.57=LDAP Schema Description
+# RFC 4530: syntaxes, matching rules, attribute types
+1.3.6.1.1.16.1=UUID
+1.3.6.1.1.16.2=uuidMatch
+1.3.6.1.1.16.3=uuidOrderingMatch
+1.3.6.1.1.16.4=entryUUID
+
+# X.520, RFC 4519: attribute types
+2.5.4.0=objectClass
+2.5.4.1=aliasedEntryName
+2.5.4.2=knowldgeinformation
+2.5.4.3=cn,commonName
+2.5.4.4=sn,surname
+2.5.4.5=serialNumber
+2.5.4.6=c,countryName
+2.5.4.7=l,localityName
+2.5.4.8=st,stateOrProvinceName
+2.5.4.9=street,streetAddress
+2.5.4.10=o,organizationName
+2.5.4.11=ou,organizationalUnitName
+2.5.4.12=title
+2.5.4.13=description
+2.5.4.14=searchGuide
+2.5.4.15=businessCategory
+2.5.4.16=postalAddress
+2.5.4.17=postalCode
+2.5.4.18=postOfficeBox
+2.5.4.19=physicalDeliveryOfficeName
+2.5.4.20=telephoneNumber
+2.5.4.21=telexNumber
+2.5.4.22=teletexTerminalIdentifier
+2.5.4.23=facsimileTelephoneNumber
+2.5.4.24=x121Address
+2.5.4.25=internationalISDNNumber
+2.5.4.26=registeredAddress
+2.5.4.27=destinationIndicator
+2.5.4.28=preferredDeliveryMethod
+2.5.4.29=presentationAddress
+2.5.4.30=supportedApplicationContext
+2.5.4.31=member
+2.5.4.32=owner
+2.5.4.33=roleOccupant
+2.5.4.34=seeAlso
+2.5.4.35=userPassword
+2.5.4.36=userCertificate
+2.5.4.37=cACertificate
+2.5.4.38=authorityRevocationList
+2.5.4.39=certificateRevocationList
+2.5.4.40=crossCertificatePair
+2.5.4.41=name
+2.5.4.42=givenName,gn
+2.5.4.43=initials
+2.5.4.44=generationQualifier
+2.5.4.45=x500UniqueIdentifier
+2.5.4.46=dnQualifier
+2.5.4.47=enhancedSearchGuide
+2.5.4.48=protocolInformation
+2.5.4.49=distinguishedName
+2.5.4.50=uniqueMember
+2.5.4.51=houseIdentifier
+2.5.4.52=supportedAlgorithms
+2.5.4.53=deltaRevocationList
+2.5.4.58=attributeCertificate
+2.5.4.65=pseudonym
+
+# X.521, RFC 4519: object classes
+2.5.6.0=top
+2.5.6.1=alias
+2.5.6.2=country
+2.5.6.3=locality
+2.5.6.4=organization
+2.5.6.5=organizationalUnit
+2.5.6.6=person
+2.5.6.7=organizationalPerson
+2.5.6.8=organizationalRole
+2.5.6.9=groupOfNames
+2.5.6.10=residentialPerson
+2.5.6.11=applicationProcess
+2.5.6.12=applicationEntity
+2.5.6.13=dSA
+2.5.6.14=device
+2.5.6.15=strongAuthenticationUser
+2.5.6.16=certificationAuthority
+2.5.6.17=groupOfUniqueNames
+2.5.6.19=cRLDistributionPoint
+2.5.6.20=dmd
+2.5.6.21=pkiUser
+2.5.6.22=pkiCA
+
+# RFC1274: attribute types
+0.9.2342.19200300.100.1.1=uid,userid
+0.9.2342.19200300.100.1.2=textEncodedORAddress
+0.9.2342.19200300.100.1.3=mail,rfc822Mailbox
+0.9.2342.19200300.100.1.4=info
+0.9.2342.19200300.100.1.5=drink,favouriteDrink
+0.9.2342.19200300.100.1.6=roomNumber
+0.9.2342.19200300.100.1.7=photo
+0.9.2342.19200300.100.1.8=userClass
+0.9.2342.19200300.100.1.9=host
+0.9.2342.19200300.100.1.10=manager
+0.9.2342.19200300.100.1.11=documentIdentifier
+0.9.2342.19200300.100.1.12=documentTitle
+0.9.2342.19200300.100.1.13=documentVersion
+0.9.2342.19200300.100.1.14=documentAuthor
+0.9.2342.19200300.100.1.15=documentLocation
+0.9.2342.19200300.100.1.20=homePhone,homeTelephoneNumber
+0.9.2342.19200300.100.1.21=secretary
+0.9.2342.19200300.100.1.22=otherMailbox
+0.9.2342.19200300.100.1.25=dc,domainComponent
+0.9.2342.19200300.100.1.26=aRecord
+0.9.2342.19200300.100.1.27=mDRecord
+0.9.2342.19200300.100.1.28=mXRecord
+0.9.2342.19200300.100.1.29=nSRecord
+0.9.2342.19200300.100.1.30=sOARecord
+0.9.2342.19200300.100.1.31=cNAMERecord
+0.9.2342.19200300.100.1.37=associatedDomain
+0.9.2342.19200300.100.1.38=associatedName
+0.9.2342.19200300.100.1.39=homePostalAddress
+0.9.2342.19200300.100.1.40=personalTitle
+0.9.2342.19200300.100.1.41=mobile,mobileTelephoneNumber
+0.9.2342.19200300.100.1.42=pager,pagerTelephoneNumber
+0.9.2342.19200300.100.1.43=co,friendlyCountryName
+0.9.2342.19200300.100.1.44=uniqueIdentifier
+0.9.2342.19200300.100.1.45=organizationalStatus
+0.9.2342.19200300.100.1.46=janetMailbox
+0.9.2342.19200300.100.1.47=mailPreferenceOption
+0.9.2342.19200300.100.1.48=buildingName
+0.9.2342.19200300.100.1.49=dSAQuality
+0.9.2342.19200300.100.1.50=singleLevelQuality
+0.9.2342.19200300.100.1.51=subtreeMinimumQuality
+0.9.2342.19200300.100.1.52=subtreeMaximumQuality
+0.9.2342.19200300.100.1.53=personalSignature
+0.9.2342.19200300.100.1.54=dITRedirect
+0.9.2342.19200300.100.1.55=audio
+0.9.2342.19200300.100.1.56=documentPublisher
+0.9.2342.19200300.100.1.60=jpegPhoto
+
+# RFC1274: object classes
+0.9.2342.19200300.100.4.4=pilotPerson,newPilotPerson
+0.9.2342.19200300.100.4.5=account
+0.9.2342.19200300.100.4.6=document
+0.9.2342.19200300.100.4.7=room
+0.9.2342.19200300.100.4.9=documentSeries
+0.9.2342.19200300.100.4.13=domain
+0.9.2342.19200300.100.4.14=RFC822localPart
+0.9.2342.19200300.100.4.15=dNSDomain
+0.9.2342.19200300.100.4.17=domainRelatedObject
+0.9.2342.19200300.100.4.18=friendlyCountry
+0.9.2342.19200300.100.4.19=simpleSecurityObject
+0.9.2342.19200300.100.4.20=pilotOrganization
+0.9.2342.19200300.100.4.21=pilotDSA
+0.9.2342.19200300.100.4.22=qualityLabelledData
+
+# RFC 2377: object class
+1.3.6.1.1.3.1=uidObject
+
+# RFC 2079 attribute type
+1.3.6.1.4.1.250.1.57=labeledURI
+
+# RFC 2713: attribute types
+1.3.6.1.4.1.42.2.27.4.1.6=javaClassName
+1.3.6.1.4.1.42.2.27.4.1.7=javaCodebase
+1.3.6.1.4.1.42.2.27.4.1.8=javaSerializedData
+1.3.6.1.4.1.42.2.27.4.1.10=javaFactory
+1.3.6.1.4.1.42.2.27.4.1.11=javaReferenceAddress
+1.3.6.1.4.1.42.2.27.4.1.12=javaDoc
+1.3.6.1.4.1.42.2.27.4.1.13=javaClassNames
+
+# RFC 2713: object classes
+1.3.6.1.4.1.42.2.27.4.2.1=javaContainer
+1.3.6.1.4.1.42.2.27.4.2.4=javaObject
+1.3.6.1.4.1.42.2.27.4.2.5=javaSerializedObject
+1.3.6.1.4.1.42.2.27.4.2.7=javaNamingReference
+1.3.6.1.4.1.42.2.27.4.2.8=javaMarshalledObject
+
+# draft-ietf-asid-schema-pilot-00
+1.3.6.1.4.1.1466.101.120.30=language
+1.3.6.1.4.1.1466.101.120.31=homeFax
+1.3.6.1.4.1.1466.101.120.32=personalMobile
+1.3.6.1.4.1.1466.101.120.33=personalPager
+1.3.6.1.4.1.1466.101.120.34=middleName
+1.3.6.1.4.1.1466.101.120.35=thumbnailPhoto
+1.3.6.1.4.1.1466.101.120.36=thumbnailLogo
+
+# RFC 2798: attribute types
+2.16.840.1.113730.3.1.1=carLicense
+2.16.840.1.113730.3.1.2=departmentNumber
+2.16.840.1.113730.3.1.3=employeeNumber
+2.16.840.1.113730.3.1.4=employeeType
+2.16.840.1.113730.3.1.39=preferredLanguage
+2.16.840.1.113730.3.1.40=userSMIMECertificate
+2.16.840.1.113730.3.1.216=userPKCS12
+2.16.840.1.113730.3.1.241=displayName
+
+# RFC 2798: object class
+2.16.840.1.113730.3.2.2=inetOrgPerson