You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/01/16 22:57:59 UTC
svn commit: r900029 - in /directory/apacheds/trunk:
core/src/main/java/org/apache/directory/server/core/journal/
default-config/ default-config/src/ default-config/src/main/
default-config/src/main/java/ default-config/src/main/java/org/
default-config...
Author: kayyagari
Date: Sat Jan 16 21:57:56 2010
New Revision: 900029
URL: http://svn.apache.org/viewvc?rev=900029&view=rev
Log:
merging the changes from CiDIT branch
Added:
directory/apacheds/trunk/default-config/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/
directory/apacheds/trunk/default-config/pom.xml
- copied unchanged from r899975, directory/apacheds/branches/apacheds-cidit/default-config/pom.xml
directory/apacheds/trunk/default-config/src/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/
directory/apacheds/trunk/default-config/src/main/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/
directory/apacheds/trunk/default-config/src/main/java/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/java/
directory/apacheds/trunk/default-config/src/main/java/org/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/java/org/
directory/apacheds/trunk/default-config/src/main/java/org/apache/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/java/org/apache/
directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/java/org/apache/directory/
directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/java/org/apache/directory/server/
directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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/LdifConfigExtractor.java
- copied unchanged from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
directory/apacheds/trunk/default-config/src/main/resources/ (props changed)
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/
directory/apacheds/trunk/default-config/src/main/resources/config/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/
directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/
directory/apacheds/trunk/default-config/src/main/resources/config/ou=config.ldif
- copied unchanged from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config.ldif
directory/apacheds/trunk/default-config/src/main/resources/config/ou=config/ou=directoryservice/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=aciauthorizationinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=authenticationinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=collectiveattributeinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=defaultauthorizationinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=eventinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=exceptioninterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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=normalizationinterceptor/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=normalizationinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=operationalattributeinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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=referralinterceptor/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=referralinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=schemainterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=subentryinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=triggerinterceptor/
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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/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=system/ou=indexes/ads-indexattributeid=objectclass.ldif
- copied unchanged from r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/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=system/ou=indexes/ads-indexattributeid=ou.ldif
- copied unchanged from r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/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=system/ou=indexes/ads-indexattributeid=uid.ldif
- copied unchanged from r899975, directory/apacheds/branches/apacheds-cidit/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=servers/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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=ldapserver/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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=transports/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps/
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 r899975, directory/apacheds/branches/apacheds-cidit/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/log4j.properties
- copied unchanged from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources/log4j.properties
directory/apacheds/trunk/default-config/src/test/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/test/
directory/apacheds/trunk/default-config/src/test/java/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/
directory/apacheds/trunk/default-config/src/test/java/org/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/org/
directory/apacheds/trunk/default-config/src/test/java/org/apache/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/org/apache/
directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/org/apache/directory/
directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/org/apache/directory/server/
directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/
- copied from r899975, directory/apacheds/branches/apacheds-cidit/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 r899975, directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java
directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java?rev=900029&r1=900028&r2=900029&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java Sat Jan 16 21:57:56 2010
@@ -81,7 +81,11 @@
{
LOG.debug( "Starting the journal" );
- store = new DefaultJournalStore();
+ if( store == null )
+ {
+ store = new DefaultJournalStore();
+ }
+
store.init( directoryService );
LOG.debug( "The Journal service has been initialized" );
@@ -144,12 +148,12 @@
public void setEnabled( boolean enabled )
{
- // TODO Auto-generated method stub
+ this.enabled = enabled;
}
public void setJournalStore( JournalStore store )
{
- // TODO Auto-generated method stub
+ this.store = store;
}
}
Propchange: directory/apacheds/trunk/default-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jan 16 21:57:56 2010
@@ -0,0 +1,5 @@
+/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
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java?rev=900029&r1=900028&r2=900029&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java Sat Jan 16 21:57:56 2010
@@ -69,7 +69,6 @@
{
super.setServiceId( SERVICE_PID_DEFAULT );
super.setServiceName( SERVICE_NAME_DEFAULT );
- setTransports( new TcpTransport( DEFAULT_IP_PORT ), new UdpTransport( DEFAULT_IP_PORT ) );
}