directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r957179 [1/2] - in /directory/apacheds/trunk: ./ core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ core-integ/src/test/java/...
Date Wed, 23 Jun 2010 13:00:47 GMT
Author: elecharny
Date: Wed Jun 23 13:00:43 2010
New Revision: 957179

URL: http://svn.apache.org/viewvc?rev=957179&view=rev
Log:
reverted back to a rev that builds : 955985

Added:
    directory/apacheds/trunk/default-config/   (props changed)
      - copied from r955985, directory/apacheds/trunk/default-config/
    directory/apacheds/trunk/default-config/pom.xml
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/pom.xml
    directory/apacheds/trunk/default-config/src/
      - copied from r955985, directory/apacheds/trunk/default-config/src/
    directory/apacheds/trunk/default-config/src/main/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/
    directory/apacheds/trunk/default-config/src/main/java/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/java/
    directory/apacheds/trunk/default-config/src/main/java/org/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/java/org/
    directory/apacheds/trunk/default-config/src/main/java/org/apache/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/java/org/apache/
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
    directory/apacheds/trunk/default-config/src/main/resources/   (props changed)
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/
    directory/apacheds/trunk/default-config/src/main/resources/config/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=aciauthorizationinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=aciauthorizationinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=authenticationinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=authenticationinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=collectiveattributeinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=collectiveattributeinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=defaultauthorizationinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=defaultauthorizationinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=eventinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=eventinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=exceptioninterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=exceptioninterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=keyderivationinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=keyderivationinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=normalizationinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=normalizationinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=operationalattributeinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=operationalattributeinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=passwordpolicyinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=passwordpolicyinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=referralinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=referralinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=schemainterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=schemainterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=subentryinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=subentryinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=triggerinterceptor.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=triggerinterceptor.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=objectclass.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=objectclass.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=ou.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=ou.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=uid.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=uid.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=replproviders.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=replproviders.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/ou=webapps/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/ou=webapps/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/ou=webapps.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/ou=webapps.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/ou=webapps/ads-id=testapp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=httpserver/ou=webapps/ads-id=testapp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=launchdiagnosticuihandler.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=launchdiagnosticuihandler.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=storedprochandler.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=storedprochandler.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/
      - copied from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/trunk/default-config/src/site/
      - copied from r955985, directory/apacheds/trunk/default-config/src/site/
    directory/apacheds/trunk/default-config/src/site/site.xml
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/site/site.xml
    directory/apacheds/trunk/default-config/src/test/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/
    directory/apacheds/trunk/default-config/src/test/java/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/java/
    directory/apacheds/trunk/default-config/src/test/java/org/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/java/org/
    directory/apacheds/trunk/default-config/src/test/java/org/apache/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/java/org/apache/
    directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/
    directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/
    directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/
    directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
    directory/apacheds/trunk/default-config/src/test/resources/
      - copied from r955985, directory/apacheds/trunk/default-config/src/test/resources/
    directory/apacheds/trunk/default-config/src/test/resources/log4j.properties
      - copied unchanged from r955985, directory/apacheds/trunk/default-config/src/test/resources/log4j.properties
Removed:
    directory/apacheds/trunk/server-config/
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Wed Jun 23 13:00:43 2010
@@ -50,6 +50,9 @@ public class ModifyOperationContext exte
     /** The modification items */
     private List<Modification> modItems;
 
+    /** The entry after being renamed and altered for rdn attributes */
+    private Entry alteredEntry;
+
 
     /**
      * Creates a new instance of ModifyOperationContext.
@@ -137,6 +140,30 @@ public class ModifyOperationContext exte
 
 
     /**
+     * Returns the entry after it has been renamed and potentially changed for 
+     * Rdn alterations.
+     *
+     * @return the new renamed entry
+     */
+    public Entry getAlteredEntry()
+    {
+        return alteredEntry;
+    }
+
+
+    /**
+     * Set the modified entry once the operation has been proceced
+     * on the backend.
+     *
+     * @param alteredEntry The modified entry
+     */
+    public void setAlteredEntry( Entry alteredEntry )
+    {
+        this.alteredEntry = alteredEntry;
+    }
+
+
+    /**
      * @see Object#toString()
      */
     public String toString()

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Wed Jun 23 13:00:43 2010
@@ -273,9 +273,9 @@ public class RegistrySynchronizerAdaptor
      * @param doCascadeModify Not used
      * @throws Exception If the modification failed
      */
-    public boolean modify( ModifyOperationContext modifyContext, Entry modifiedEntry, boolean doCascadeModify ) throws LdapException
+    public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean doCascadeModify ) throws LdapException
     {
-        Entry entry = modifiedEntry;
+        Entry entry = modifyContext.getEntry();
         EntryAttribute oc = entry.get( objectClassAT );
         
         for ( Value<?> value:oc )
@@ -285,14 +285,14 @@ public class RegistrySynchronizerAdaptor
             if ( objectClass2synchronizerMap.containsKey( oid ) )
             {
                 RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
-                boolean hasModification = synchronizer.modify( modifyContext, modifiedEntry, doCascadeModify );
+                boolean hasModification = synchronizer.modify( modifyContext, targetEntry, doCascadeModify );
                 return hasModification;
             }
         }
 
         if ( oc.contains( MetaSchemaConstants.META_SCHEMA_OC ) )
         {
-            boolean hasModification = schemaSynchronizer.modify( modifyContext, modifiedEntry, doCascadeModify );
+            boolean hasModification = schemaSynchronizer.modify( modifyContext, targetEntry, doCascadeModify );
             return hasModification;
         }
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Wed Jun 23 13:00:43 2010
@@ -115,9 +115,9 @@ public class SchemaSynchronizer implemen
      * Depending in the existence of this attribute in the previous entry, we will
      * have to update the entry or not.
      */
-    public boolean modify( ModifyOperationContext modifyContext, Entry modifiedEntry, boolean cascade ) throws LdapException
+    public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade ) throws LdapException
     {
-        Entry entry = modifiedEntry;
+        Entry entry = modifyContext.getEntry();
         List<Modification> mods = modifyContext.getModItems(); 
         boolean hasModification = SCHEMA_UNCHANGED;
         
@@ -134,11 +134,11 @@ public class SchemaSynchronizer implemen
             ModificationOperation modification = disabledModification.getOperation();
             EntryAttribute attribute = disabledModification.getAttribute();
             
-            hasModification = modifyDisable( modifyContext, modifiedEntry, modification, attribute, disabledInEntry );
+            hasModification = modifyDisable( modifyContext, modification, attribute, disabledInEntry );
         }
         else if ( disabledInEntry != null )
         {
-            hasModification = modifyDisable( modifyContext, modifiedEntry, ModificationOperation.REMOVE_ATTRIBUTE, null, disabledInEntry );
+            hasModification = modifyDisable( modifyContext, ModificationOperation.REMOVE_ATTRIBUTE, null, disabledInEntry );
         }
             
         
@@ -391,7 +391,7 @@ public class SchemaSynchronizer implemen
      * +-------+-------+-------------------+--------------------+--------------------+
      * </pre>
      */
-    private boolean modifyDisable( ModifyOperationContext modifyContext, Entry modifiedEntry, ModificationOperation modOp, 
+    private boolean modifyDisable( ModifyOperationContext modifyContext, ModificationOperation modOp, 
         EntryAttribute disabledInMods, EntryAttribute disabledInEntry ) throws LdapException
     {
         DN name = modifyContext.getDn();

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Wed Jun 23 13:00:43 2010
@@ -1863,7 +1863,7 @@ public class SearchIT extends AbstractLd
 
 
    @Test
-   public void testSearchFilterWithBadAttributeType() throws Exception
+   public void testSearchFilterBadAttributeType() throws Exception
    {
        SearchControls controls = new SearchControls();
        controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1884,26 +1884,4 @@ public class SearchIT extends AbstractLd
        assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
        assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
    }
-
-
-   @Test
-   public void testSearchFilterBadAttributeType() throws Exception
-   {
-       SearchControls controls = new SearchControls();
-       controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-       controls.setDerefLinkFlag( false );
-       sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-               AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
-       HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
-       NamingEnumeration<SearchResult> list = sysRoot.search( "", "(badAttr=*)", controls );
-       
-       while ( list.hasMore() )
-       {
-           SearchResult result = list.next();
-           map.put( result.getName(), result.getAttributes() );
-       }
-
-       assertEquals( "Expected number of results returned was incorrect!", 0, map.size() );
-   }
 }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Wed Jun 23 13:00:43 2010
@@ -90,7 +90,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
 import org.apache.directory.shared.ldap.util.Base64;
 import org.apache.directory.shared.ldap.util.DateUtils;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -1860,7 +1859,7 @@ public class SubschemaSubentryIT extends
      * @throws NamingException on error
      */
     @Test
-    @Ignore // @TODO as we can't modify a schema element, the end of this test has been commented
+    // @TODO as we can't modify a schema element, the end of this test has been commented
     public void testTimestampAndModifierUpdates() throws Exception, InterruptedException
     {
         TimeZone tz = TimeZone.getTimeZone( "GMT" );
@@ -1868,6 +1867,7 @@ public class SubschemaSubentryIT extends
         Attributes subentry = this.getSubschemaSubentryAttributes();
         
         // check first that everything that is required is present
+        
         Attribute creatorsNameAttr = subentry.get( "creatorsName" );
         Attribute createTimestampAttr = subentry.get( "createTimestamp" );
         assertNotNull( creatorsNameAttr );
@@ -1901,6 +1901,7 @@ public class SubschemaSubentryIT extends
         getRootContext( service ).modifyAttributes( DN.toName( dn ), mods );
 
         // now check the modification timestamp and the modifiers name
+
         subentry = this.getSubschemaSubentryAttributes();
         
         // check first that everything that is required is present
@@ -1922,12 +1923,7 @@ public class SubschemaSubentryIT extends
         Date modifyTimestampAfter = DateUtils.getDate( ( String ) modifiersTimestampAttrAfter.get() );
         assertTrue( modifyTimestampAfter.getTime() <= cal.getTime().getTime() );
 
-        //if ( modifyTimestampAfter.getTime() < modifyTimestamp.getTime() )
-        { 
-            System.out.println( "now   : " + modifyTimestampAttr.get() + ", " + modifyTimestamp.getTime() );
-            System.out.println( "after : " +  modifiersTimestampAttrAfter.get() + ", " + modifyTimestampAfter.getTime() );
-        }
-        
+
         assertTrue( modifyTimestampAfter.getTime() >= modifyTimestamp.getTime() );
 
         // now let's test the modifiersName update with another user besides

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Wed Jun 23 13:00:43 2010
@@ -198,7 +198,7 @@ public class EventInterceptor extends Ba
 
         // Get the modified entry
         Entry alteredEntry = modifyContext.lookup( modifyContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
-        modifyContext.setModifiedEntry( ( ClonedServerEntry ) alteredEntry );
+        modifyContext.setAlteredEntry( ( ClonedServerEntry ) alteredEntry );
 
         for ( final RegistrationEntry registration : selecting )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java Wed Jun 23 13:00:43 2010
@@ -26,7 +26,6 @@ import java.util.List;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -168,15 +167,7 @@ public class FilterNormalizingVisitor im
      */
     private ExprNode visitPresenceNode( PresenceNode node ) throws LdapException
     {
-        try
-        { 
-            node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() ) );
-        }
-        catch ( LdapNoSuchAttributeException lnsae )
-        {
-            return null;
-        }
-        
+        node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() ) );
         return node;
     }
 
@@ -201,16 +192,6 @@ public class FilterNormalizingVisitor im
             return null;
         }
 
-        // Check that the AttributeType is valid
-        try
-        {
-            node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() ) );
-        }
-        catch ( LdapNoSuchAttributeException lnsae )
-        {
-            return null;
-        }
-
         Value<?> normalized = normalizeValue( node.getAttribute(), node.getValue() );
 
         if ( normalized == null )
@@ -218,6 +199,7 @@ public class FilterNormalizingVisitor im
             return null;
         }
 
+        node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() ) );
         node.setValue( normalized );
 
         return node;
@@ -325,15 +307,7 @@ public class FilterNormalizingVisitor im
      */
     private ExprNode visitExtensibleNode( ExtensibleNode node ) throws LdapException
     {
-        // Check that the AttributeType is valid
-        try
-        {
-            node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() ) );
-        }
-        catch ( LdapNoSuchAttributeException lnsae )
-        {
-            return null;
-        }
+        node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute() ) );
 
         return node;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Wed Jun 23 13:00:43 2010
@@ -1209,7 +1209,7 @@ public class SubentryInterceptor extends
 
             if ( !objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
             {
-                Entry newEntry = modifyContext.getModifiedEntry(); 
+                Entry newEntry = modifyContext.getAlteredEntry(); 
 
                 List<Modification> subentriesOpAttrMods = getModsOnEntryModification( dn, entry, newEntry );
 

Propchange: directory/apacheds/trunk/default-config/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 23 13:00:43 2010
@@ -0,0 +1,5 @@
+target
+*.iml
+.classpath
+.project
+.settings

Propchange: directory/apacheds/trunk/default-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 23 13:00:43 2010
@@ -0,0 +1,6 @@
+/directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources:897934-899975
+/directory/apacheds/branches/apacheds-replication/core-annotations/src/main/resources:749790-764110
+/directory/apacheds/branches/apacheds-replication/default-config/src/main/resources:749790-764110
+/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/resources:806623-896441
+/directory/apacheds/branches/apacheds-schema/default-config/src/main/resources:806623-896441
+/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Wed Jun 23 13:00:43 2010
@@ -23,21 +23,26 @@ package org.apache.directory.server.core
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.File;
+import java.util.Map;
+import java.util.Set;
 
+import org.apache.commons.lang.NotImplementedException;
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 
@@ -48,11 +53,12 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-//@Ignore ( "Ignore this test until we get the LDIF partition in place." )
+@Ignore ( "Ignore this test until we get the LDIF partition in place." )
 public class PartitionSchemaLoaderTest
 {
     private static SchemaManager schemaManager;
     private static DirectoryService directoryService;
+    private static JdbmPartition schemaPartition;
 
 
     @BeforeClass public static void setUp() throws Exception
@@ -91,126 +97,153 @@ public class PartitionSchemaLoaderTest
         {
             fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) );
         }
-        
-        directoryService.setSchemaManager( schemaManager );
+
+        // --------------------------------------------------------------------
+        // TODO add code here to start up the LDIF schema partition
+        // --------------------------------------------------------------------
+
+        throw new NotImplementedException();
     }
     
     
-    @Test 
-    public void testGetSchemas() throws Exception
+    @Test public void testGetSchemas() throws Exception
     {
-        SchemaLoader loader = directoryService.getSchemaManager().getLoader();
+        PartitionSchemaLoader loader = new PartitionSchemaLoader( schemaPartition, schemaManager );
+        Map<String,Schema> schemas = loader.getSchemas();
         
-        Schema schema = loader.getSchema( "mozilla" );
+        Schema schema = schemas.get( "mozilla" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "mozilla" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "core" );
+        schema = schemas.get( "core" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "core" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "apachedns" );
+        schema = schemas.get( "apachedns" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "apachedns" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "autofs" );
+        schema = schemas.get( "autofs" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "autofs" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "apache" );
+        schema = schemas.get( "apache" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "apache" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
 
-        schema = loader.getSchema( "cosine" );
+        schema = schemas.get( "cosine" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "cosine" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "krb5kdc" );
+        schema = schemas.get( "krb5kdc" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "krb5kdc" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "samba" );
+        schema = schemas.get( "samba" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "samba" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "collective" );
+        schema = schemas.get( "collective" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "collective" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "java" );
+        schema = schemas.get( "java" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "java" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "dhcp" );
+        schema = schemas.get( "dhcp" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "dhcp" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "corba" );
+        schema = schemas.get( "corba" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "corba" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "nis" );
+        schema = schemas.get( "nis" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "nis" );
         //assertTrue( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "inetorgperson" );
+        schema = schemas.get( "inetorgperson" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "inetorgperson" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "system" );
+        schema = schemas.get( "system" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "system" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
         
-        schema = loader.getSchema( "apachemeta" );
+        schema = schemas.get( "apachemeta" );
         assertNotNull( schema );
         assertEquals( schema.getSchemaName(), "apachemeta" );
         assertFalse( schema.isDisabled() );
         assertEquals( schema.getOwner(), "uid=admin,ou=system" );
         schema = null;
     }
+    
+    
+    @Test public void testGetSchemaNames() throws Exception
+    {
+        PartitionSchemaLoader loader = new PartitionSchemaLoader( schemaPartition, schemaManager );
+        Set<String> schemaNames = loader.getSchemaNames();
+        assertTrue( schemaNames.contains( "mozilla" ) );
+        assertTrue( schemaNames.contains( "core" ) );
+        assertTrue( schemaNames.contains( "apachedns" ) );
+        assertTrue( schemaNames.contains( "autofs" ) );
+        assertTrue( schemaNames.contains( "apache" ) );
+        assertTrue( schemaNames.contains( "cosine" ) );
+        assertTrue( schemaNames.contains( "krb5kdc" ) );
+        assertTrue( schemaNames.contains( "samba" ) );
+        assertTrue( schemaNames.contains( "collective" ) );
+        assertTrue( schemaNames.contains( "java" ) );
+        assertTrue( schemaNames.contains( "dhcp" ) );
+        assertTrue( schemaNames.contains( "corba" ) );
+        assertTrue( schemaNames.contains( "nis" ) );
+        assertTrue( schemaNames.contains( "inetorgperson" ) );
+        assertTrue( schemaNames.contains( "system" ) );
+        assertTrue( schemaNames.contains( "apachemeta" ) );
+    }
 }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Wed Jun 23 13:00:43 2010
@@ -47,8 +47,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -69,19 +69,19 @@ public class LdapConnectionTest extends 
     
     private static final String ADMIN_DN = "uid=admin,ou=system";
 
-    private LdapConnection connection;
+    private static LdapConnection connection;
     
     
-    @Before
-    public void bindConnection() throws Exception
+    @BeforeClass
+    public static void bindConnection() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
         connection.bind( ADMIN_DN, "secret" );
     }
     
     
-    @After
-    public void unbindConnection() throws Exception
+    @AfterClass
+    public static void unbindConnection() throws Exception
     {
         connection.close();
     }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Wed Jun 23 13:00:43 2010
@@ -48,7 +48,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.name.DN;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -80,11 +80,11 @@ import org.junit.runner.RunWith;
     })
 public class LdapSSLConnectionTest extends AbstractLdapTestUnit
 {
-    private LdapConnectionConfig config;
+    private static LdapConnectionConfig config;
     
     
-    @Before
-    public void setup()
+    @BeforeClass
+    public static void setup()
     {
         X509TrustManager X509 = new X509TrustManager()
         {

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Wed Jun 23 13:00:43 2010
@@ -44,8 +44,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.DN;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -79,10 +79,10 @@ import org.junit.runner.RunWith;
 })
 public class ClientSearchRequestTest extends AbstractLdapTestUnit
 {
-    private  LdapAsyncConnection connection;
+    private static LdapAsyncConnection connection;
 
-    @Before
-    public void setup() throws Exception
+    @BeforeClass
+    public static void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
         DN bindDn = new DN( "uid=admin,ou=system" );
@@ -93,8 +93,8 @@ public class ClientSearchRequestTest ext
     /**
      * Close the LdapConnection
      */
-    @After
-    public void shutdown()
+    @AfterClass
+    public static void shutdown()
     {
         try
         {

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java Wed Jun 23 13:00:43 2010
@@ -39,8 +39,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.name.DN;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -74,10 +74,10 @@ import org.junit.runner.RunWith;
 })
 public class SearchRequestReturningAttributesTest extends AbstractLdapTestUnit
 {
-    private LdapConnection connection;
+    private static LdapConnection connection;
 
-    @Before
-    public void setup() throws Exception
+    @BeforeClass
+    public static void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
         DN bindDn = new DN( "uid=admin,ou=system" );
@@ -88,8 +88,8 @@ public class SearchRequestReturningAttri
     /**
      * Close the LdapConnection
      */
-    @After
-    public void shutdown()
+    @AfterClass
+    public static void shutdown()
     {
         try
         {

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Wed Jun 23 13:00:43 2010
@@ -313,7 +313,7 @@ public class LdifPartition extends BTree
 
         // Get the modified entry and store it in the context for post usage
         ClonedServerEntry modifiedEntry = lookup( id );
-        modifyContext.setModifiedEntry( modifiedEntry );
+        modifyContext.setAlteredEntry( modifiedEntry );
 
         // just overwrite the existing file
         DN dn = modifyContext.getDn();

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=957179&r1=957178&r2=957179&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Wed Jun 23 13:00:43 2010
@@ -122,7 +122,7 @@
     <module>protocol-changepw</module>
     <module>server-integ</module>
     <module>server-tools</module>
-    <module>server-config</module>
+    <module>default-config</module>
     <!--Uncomment to build all in one OSGi bundle-->
     <!--<module>osgi</module>-->
     <module>server-jndi</module>



Mime
View raw message