You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/10/24 14:02:44 UTC

svn commit: r1188102 [3/3] - in /directory/shared/branches/shared-osgi: ./ all/ asn1/api/ asn1/ber/ dsml/engine/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/rep...

Modified: directory/shared/branches/shared-osgi/ldap/schema/converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/schema/converter/pom.xml?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/schema/converter/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/schema/converter/pom.xml Mon Oct 24 12:02:39 2011
@@ -111,7 +111,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.schema.converter</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/branches/shared-osgi/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java (original)
+++ directory/shared/branches/shared-osgi/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java Mon Oct 24 12:02:39 2011
@@ -31,7 +31,7 @@ import java.util.List;
 
 /**
  * A class used to translate a OpenLdap schema file to a Ldif file compatible
- * with the Apache DS meta schema format
+ * with the ApacheDS meta schema format
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:02:39 2011
@@ -10,4 +10,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351
+/directory/shared/trunk/ldap/schema/data:1185684-1188093
 /directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml Mon Oct 24 12:02:39 2011
@@ -138,12 +138,21 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.schema</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true,
                 org.apache.directory.shared.ldap.schemaextractor.impl;version="${project.version}";-noimport:=true,
                 org.apache.directory.shared.ldap.schemamanager.impl;version="${project.version}";-noimport:=true
             </Export-Package>
+            <Import-Package>
+              *,
+              org.apache.directory.shared.ldap.aci,
+              org.apache.directory.shared.ldap.model.schema.comparators,
+              org.apache.directory.shared.ldap.model.schema.normalizers,
+              org.apache.directory.shared.ldap.model.schema.parsers,
+              org.apache.directory.shared.ldap.model.schema.registries,
+              org.apache.directory.shared.ldap.model.schema.syntaxCheckers
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:02:39 2011
@@ -9,5 +9,6 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1185684-1188093
 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*

Modified: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Mon Oct 24 12:02:39 2011
@@ -1593,13 +1593,34 @@ public class DefaultSchemaManager implem
         return new ImmutableSyntaxCheckerRegistry( registries.getSyntaxCheckerRegistry() );
     }
 
+    
+    /**
+     * Get rid of AT's options (everything after the ';'
+     * @param oid
+     * @return
+     */
+    private String stripOptions( String oid )
+    {
+        int semiColonPos = oid.indexOf( ';' );
+        
+        if ( semiColonPos != -1 )
+        {
+            return oid.substring( 0, semiColonPos );
+        }
+        else
+        {
+            return oid;
+        }
+    }
 
     /**
      * {@inheritDoc}
      */
     public AttributeType lookupAttributeTypeRegistry( String oid ) throws LdapException
     {
-        return registries.getAttributeTypeRegistry().lookup( Strings.toLowerCase( oid ).trim() );
+        String oidTrimmed = Strings.toLowerCase( oid ).trim();
+        String oidNoOption = stripOptions( oidTrimmed );
+        return registries.getAttributeTypeRegistry().lookup( oidNoOption );
     }
 
 

Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:02:39 2011
@@ -9,5 +9,6 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1185684-1188093
 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844

Modified: directory/shared/branches/shared-osgi/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.0.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.0.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.0.ldif (original)
+++ directory/shared/branches/shared-osgi/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.0.ldif Mon Oct 24 12:02:39 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.0,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-compositeElement
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.0
 m-description: A base AttributeType for attributeType referencing composite configuration elements
-m-substr: caseExactSubstringsMatch
-m-supattributetype: name
-objectclass: metaAttributeType
-objectclass: metaTop
 objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-compositeElement
-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-osgi/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.100.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.100.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.100.ldif (original)
+++ directory/shared/branches/shared-osgi/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.100.ldif Mon Oct 24 12:02:39 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.100,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-directoryServiceId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.100
 m-description: The DirectoryService 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-directoryServiceId
-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-osgi/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.101.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.101.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.101.ldif (original)
+++ directory/shared/branches/shared-osgi/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.101.ldif Mon Oct 24 12:02:39 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.101,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsAccessControlEnabled
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.101
 m-description: Tells if access control is activated or not
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsAccessControlEnabled
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.102.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.102.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.102.ldif (original)
+++ directory/shared/branches/shared-osgi/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.102.ldif Mon Oct 24 12:02:39 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.102,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsAllowAnonymousAccess
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.102
 m-description: Tells if anonymous access are allowed or not
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsAllowAnonymousAccess
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.103.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.103.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.103.ldif (original)
+++ directory/shared/branches/shared-osgi/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.103.ldif Mon Oct 24 12:02:39 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.103,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsDenormalizeOpAttrsEnabled
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.103
 m-description: Tells if the operational attributes are denormalized or not
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsDenormalizeOpAttrsEnabled
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.104.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.104.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.104.ldif (original)
+++ directory/shared/branches/shared-osgi/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.104.ldif Mon Oct 24 12:02:39 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.104,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsPasswordHidden
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.104
 m-description: Tells if the password is stored encrypted even for PLAIN authentication
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsPasswordHidden
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.105.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.105.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.105.ldif (original)
+++ directory/shared/branches/shared-osgi/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.105.ldif Mon Oct 24 12:02:39 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.105,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-changeLog
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.105
 m-description: The ChangeLog system
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-changeLog
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.108.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.108.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.108.ldif (original)
+++ directory/shared/branches/shared-osgi/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.108.ldif Mon Oct 24 12:02:39 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.108,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-partitions
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.108
 m-description: The set of partitions
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-partitions
-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-osgi/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.110.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.110.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.110.ldif (original)
+++ directory/shared/branches/shared-osgi/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.110.ldif Mon Oct 24 12:02:39 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.110,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
-m-oid: 1.3.6.1.4.1.18060.0.4.1.2.110
+m-name: ads-dsMaxPDUSize
 m-description: Gives the maximum size of a PDU
+m-oid: 1.3.6.1.4.1.18060.0.4.1.2.110
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-dsMaxPDUSize
-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-osgi/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.111.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.111.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.111.ldif (original)
+++ directory/shared/branches/shared-osgi/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.111.ldif Mon Oct 24 12:02:39 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.111,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-dsSyncPeriodMillis
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.111
 m-description: Define the duration between two flushes on disk
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-dsSyncPeriodMillis
-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-osgi/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.112.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.112.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.112.ldif (original)
+++ directory/shared/branches/shared-osgi/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.112.ldif Mon Oct 24 12:02:39 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.112,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-dsReplicaId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.112
 m-description: The server identifier, used for replication
-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-dsReplicaId
-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-osgi/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.113.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.113.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.113.ldif (original)
+++ directory/shared/branches/shared-osgi/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.113.ldif Mon Oct 24 12:02:39 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.113,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-dsTestEntries
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.113
 m-description: The set of entries to inject at startup (may be obsolete)
-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-dsTestEntries
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.115.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.115.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.115.ldif (original)
+++ directory/shared/branches/shared-osgi/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.115.ldif Mon Oct 24 12:02:39 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.115,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-servers
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.115
 m-description: The references to the servers
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-servers
-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-osgi/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.116.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.116.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.116.ldif (original)
+++ directory/shared/branches/shared-osgi/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.116.ldif Mon Oct 24 12:02:39 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.116,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-interceptors
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.116
 m-description: The references to the interceptors
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-interceptors
-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-osgi/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.117.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.117.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.117.ldif (original)
+++ directory/shared/branches/shared-osgi/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.117.ldif Mon Oct 24 12:02:39 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.117,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journal
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.117
 m-description: The reference to the Journal
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-journal
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.120.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.120.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.120.ldif (original)
+++ directory/shared/branches/shared-osgi/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.120.ldif Mon Oct 24 12:02:39 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.120,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-changeLogId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.120
 m-description: The ChangeLog identifier
-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-changeLogId
-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-osgi/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.121.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.121.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.121.ldif (original)
+++ directory/shared/branches/shared-osgi/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.121.ldif Mon Oct 24 12:02:39 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.121,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-changeLogExposed
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.121
 m-description: Tells if the changeLog system is visible by the clients
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-changeLogExposed
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-osgi/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.130.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.130.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.130.ldif (original)
+++ directory/shared/branches/shared-osgi/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.130.ldif Mon Oct 24 12:02:39 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.130,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-interceptorId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.130
 m-description: The Interceptor identifier
-m-substr: caseExactSubstringsMatch
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-interceptorId
-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-osgi/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.131.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.131.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.131.ldif (original)
+++ directory/shared/branches/shared-osgi/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.131.ldif Mon Oct 24 12:02:39 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.131,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-interceptorOrder
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.131
 m-description: The Interceptor order number
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-interceptorOrder
-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-osgi/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.141.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.141.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.141.ldif (original)
+++ directory/shared/branches/shared-osgi/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.141.ldif Mon Oct 24 12:02:39 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.141,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journalRotation
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.141
 m-description: The size before a journal rotation occurs.
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-journalRotation
-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-osgi/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.142.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/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.142.ldif?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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.142.ldif (original)
+++ directory/shared/branches/shared-osgi/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.142.ldif Mon Oct 24 12:02:39 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.142,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journalWorkingDir
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.142
 m-description: The place on disk where the journal is stored.
-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-journalWorkingDir
-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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/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-osgi/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=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/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-osgi/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 Mon Oct 24 12:02:39 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-osgi/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/util/pom.xml?rev=1188102&r1=1188101&r2=1188102&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/util/pom.xml (original)
+++ directory/shared/branches/shared-osgi/util/pom.xml Mon Oct 24 12:02:39 2011
@@ -54,7 +54,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.util</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>