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/03/26 20:17:42 UTC
svn commit: r1085789 [4/4] - in /directory/shared/trunk:
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
dsml/parser/src/test/java/org/apache/directory/shared/d...
Modified: directory/shared/trunk/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.819.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/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.819.ldif?rev=1085789&r1=1085788&r2=1085789&view=diff
==============================================================================
--- directory/shared/trunk/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.819.ldif (original)
+++ directory/shared/trunk/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.819.ldif Sat Mar 26 19:17:40 2011
@@ -7,7 +7,7 @@ m-description: the alias dereference mod
objectclass: metaAttributeType
objectclass: metaTop
objectclass: top
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+m-syntax: 1.3.6.1.4.1.18060.0.4.1.0.11
m-name: ads-replAliasDerefMode
creatorsname: uid=admin,ou=system
m-equality: integerMatch
Modified: directory/shared/trunk/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.821.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/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.821.ldif?rev=1085789&r1=1085788&r2=1085789&view=diff
==============================================================================
--- directory/shared/trunk/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.821.ldif (original)
+++ directory/shared/trunk/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.821.ldif Sat Mar 26 19:17:40 2011
@@ -7,7 +7,7 @@ m-description: the search scope of the r
objectclass: metaAttributeType
objectclass: metaTop
objectclass: top
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+m-syntax: 1.3.6.1.4.1.18060.0.4.1.0.10
m-name: ads-replSearchScope
creatorsname: uid=admin,ou=system
m-equality: integerMatch
Modified: directory/shared/trunk/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.828.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/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.828.ldif?rev=1085789&r1=1085788&r2=1085789&view=diff
==============================================================================
--- directory/shared/trunk/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.828.ldif (original)
+++ directory/shared/trunk/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.828.ldif Sat Mar 26 19:17:40 2011
@@ -7,7 +7,7 @@ m-substr: caseIgnoreIA5SubstringsMatch
objectclass: metaAttributeType
objectclass: metaTop
objectclass: top
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.3
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
m-name: ads-replAttribute
creatorsname: uid=admin,ou=system
m-equality: caseIgnoreIA5Match
Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxcheckers/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dsyntaxcheckers/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.10.ldif?rev=1085789&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxcheckers/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif (added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxcheckers/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif Sat Mar 26 19:17:40 2011
@@ -0,0 +1,11 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.10,ou=syntaxCheckers,cn=adsconfig,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaSyntaxChecker
+m-oid: 1.3.6.1.4.1.18060.0.4.1.0.10
+m-fqcn: org.apache.directory.shared.ldap.model.schema.syntaxCheckers.SearchScop
+ eSyntaxChecker
+entrycsn: 20100111202214.878000Z#000000#000#000000
+creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+createtimestamp: 20100111145217Z
Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxcheckers/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dsyntaxcheckers/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.11.ldif?rev=1085789&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxcheckers/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif (added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxcheckers/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif Sat Mar 26 19:17:40 2011
@@ -0,0 +1,11 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.11,ou=syntaxCheckers,cn=adsconfig,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaSyntaxChecker
+m-oid: 1.3.6.1.4.1.18060.0.4.1.0.11
+m-fqcn: org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DerefAlias
+ SyntaxChecker
+entrycsn: 20100111202214.878000Z#000000#000#000000
+creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+createtimestamp: 20100111145217Z
Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.10.ldif?rev=1085789&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif (added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif Sat Mar 26 19:17:40 2011
@@ -0,0 +1,13 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.10,ou=syntaxes,cn=adsconfig,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaSyntax
+m-oid: 1.3.6.1.4.1.18060.0.4.1.0.10
+m-description: a syntax for SearchScope
+x-humanreadable: TRUE
+m-obsolete: FALSE
+entrycsn: 20100111202214.878000Z#000000#000#000000
+creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+createtimestamp: 20100111145217Z
+
Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.11.ldif?rev=1085789&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif (added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif Sat Mar 26 19:17:40 2011
@@ -0,0 +1,13 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.11,ou=syntaxes,cn=adsconfig,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaSyntax
+m-oid: 1.3.6.1.4.1.18060.0.4.1.0.11
+m-description: a syntax for DerefAlias
+x-humanreadable: TRUE
+m-obsolete: FALSE
+entrycsn: 20100111202214.878000Z#000000#000#000000
+creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+createtimestamp: 20100111145217Z
+
Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java?rev=1085789&r1=1085788&r2=1085789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java Sat Mar 26 19:17:40 2011
@@ -33,8 +33,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.model.schema.registries.Schema;
@@ -47,6 +45,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* A test class for SchemaManager enable/disable and loadAllEnbled() methods.
@@ -159,9 +160,9 @@ public class SchemaManagerEnableDisableL
assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
- assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
- assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 666, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
+ assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
+ assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -204,9 +205,9 @@ public class SchemaManagerEnableDisableL
assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
assertEquals( 135, schemaManager.getObjectClassRegistry().size() );
- assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
- assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 709, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
+ assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
+ assertEquals( 711, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -244,9 +245,9 @@ public class SchemaManagerEnableDisableL
assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
- assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
- assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 666, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
+ assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
+ assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -296,9 +297,9 @@ public class SchemaManagerEnableDisableL
assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
assertEquals( 146, schemaManager.getObjectClassRegistry().size() );
- assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
- assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 757, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
+ assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
+ assertEquals( 759, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );