You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/10/21 13:42:28 UTC

svn commit: r1187306 [4/4] - in /directory/shared/branches/shared-txns: ./ all/ asn1/api/ asn1/ber/ dsml/engine/ dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsm...

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.143.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.143.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.143.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.143.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.143,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journalFileName
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.143
 m-description: The journal file name.
-m-substr: caseExactSubstringsMatch
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-journalFileName
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.144.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.144.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.144.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.144.ldif Fri Oct 21 11:42:22 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.144,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journalId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.144
 m-description: The Journal ID
-m-substr: caseExactSubstringsMatch
-m-supattributetype: name
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-journalId
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: name
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.150.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.150.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.150.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.150.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.150,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-partitionId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.150
 m-description: The Partition identifier
-m-substr: caseExactSubstringsMatch
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-partitionId
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.151.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.151.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.151.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.151.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.151,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: distinguishedNameMatch
-m-singlevalue: TRUE
+m-name: ads-partitionSuffix
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.151
 m-description: The partition suffix
-m-supattributetype: distinguishedName
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.12
-m-name: ads-partitionSuffix
-creatorsname: uid=admin,ou=system
 m-equality: distinguishedNameMatch
+m-ordering: distinguishedNameMatch
+m-singlevalue: TRUE
+m-supattributetype: distinguishedName
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.152.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.152.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.152.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.152.ldif Fri Oct 21 11:42:22 2011
@@ -1,10 +1,10 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.152,ou=attributeTypes,cn=adsconfig,ou=schema
+m-name: ads-indexes
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.152
 m-description: A reference to the indexed attributes
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-m-name: ads-indexes
+m-supattributetype: ads-compositeElement
 creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.153.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.153.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.153.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.153.ldif Fri Oct 21 11:42:22 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.153,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-partitionCacheSize
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.153
 m-description: The number of entries in the cache for this partition
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-partitionCacheSize
-creatorsname: uid=admin,ou=system
 m-equality: integerMatch
+m-ordering: integerOrderingMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.154.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.154.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.154.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.154.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.154,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-contextEntry
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.154
 m-description: The Partition context entry
-m-substr: caseExactSubstringsMatch
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
-m-name: ads-contextEntry
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.313.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.313.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.313.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.313.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.313,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-passwordPolicies
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.313
-m-description: The PasswordPolicy configurations
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
+m-description: The PasswordPolicy configuration
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-passwordPolicies
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.804.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.804.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.804.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.804.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.804,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-interceptorClassName
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.804
 m-description: Fully qualified class name of the interceptor
-m-substr: caseExactSubstringsMatch
 objectclass: metaTop
 objectclass: metaAttributeType
 objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-interceptorClassName
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.933.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.933.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.933.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.933.ldif Fri Oct 21 11:42:22 2011
@@ -1,11 +1,11 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.933, ou=attributeTypes, cn=adsconfig, ou=schema
-objectclass: top
-objectclass: metaTop
-objectclass: metaAttributeType
 m-name: ads-authenticators
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.933
 m-description: A reference to the authenticators
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-supattributetype: ads-compositeElement
 createtimestamp: 20100111145216Z
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.100.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif Fri Oct 21 11:42:22 2011
@@ -1,17 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.100,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.100
+m-name: ads-directoryService
+m-description: The DirectoryService ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-directoryServiceId
 m-must: ads-dsReplicaId
 m-must: ads-interceptors
 m-must: ads-partitions
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.100
-m-supobjectclass: ads-base
-m-description: The DirectoryService ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-directoryService
-creatorsname: uid=admin,ou=system
 m-may: ads-servers
 m-may: ads-dsAccessControlEnabled
 m-may: ads-dsAllowAnonymousAccess
@@ -22,3 +21,4 @@ m-may: ads-dsMaxPDUSize
 m-may: ads-dsPasswordHidden
 m-may: ads-dsSyncPeriodMillis
 m-may: ads-dsTestEntries
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.130.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif Fri Oct 21 11:42:22 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.130,ou=objectClasses,cn=adsconfig,ou=schema
-m-must: ads-interceptorId
-m-must: ads-interceptorOrder
-m-must: ads-interceptorClassName
+m-name: ads-interceptor
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.130
-m-supobjectclass: ads-base
 m-description: The Interceptor ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
 objectclass: top
-m-name: ads-interceptor
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
+m-must: ads-interceptorId
+m-must: ads-interceptorOrder
+m-must: ads-interceptorClassName
 creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.131.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif Fri Oct 21 11:42:22 2011
@@ -1,11 +1,11 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.131, ou=objectClasses, cn=adsconfig, ou=schema
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-authenticationInterceptor
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.131
 m-description: The AuthenticationInterceptor ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
 m-supobjectclass: ads-interceptor
 m-may: ads-authenticators
 m-may: ads-passwordPolicies

Modified: directory/shared/branches/shared-txns/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/pom.xml (original)
+++ directory/shared/branches/shared-txns/pom.xml Fri Oct 21 11:42:22 2011
@@ -724,3 +724,4 @@
   </profiles>
 
 </project>
+

Propchange: directory/shared/branches/shared-txns/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -0,0 +1,9 @@
+/directory/shared/branches/milestones/util:1072811-1074633,1074637-1075326
+/directory/shared/branches/shared-codec-merge/util:982370-987558
+/directory/shared/branches/shared-config/util:1023444-1029061
+/directory/shared/branches/shared-osgi/util:1103720-1124653
+/directory/shared/branches/shared-replication/util:749791-764113
+/directory/shared/branches/shared-schema/util:806622-896441
+/directory/shared/branches/shared-subtree/util:965208-965686
+/directory/shared/branches/xdbm-refactoring/util:945830-946347
+/directory/shared/trunk/util:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187277

Modified: directory/shared/branches/shared-txns/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/util/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/util/pom.xml (original)
+++ directory/shared/branches/shared-txns/util/pom.xml Fri Oct 21 11:42:22 2011
@@ -56,8 +56,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.util</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.util,
-              org.apache.directory.shared.util.exception
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>