directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r725712 [1/9] - in /directory: apacheds/trunk/ apacheds/trunk/all/ apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltr...
Date Thu, 11 Dec 2008 15:32:12 GMT
Author: elecharny
Date: Thu Dec 11 07:32:04 2008
New Revision: 725712

URL: http://svn.apache.org/viewvc?rev=725712&view=rev
Log:
merged ads-mina2 branch into trunk (crossing fingers, hands, arm, legs, etc ...)

Added:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/
      - copied from r725663, directory/apacheds/branches/apacheds-mina2/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
      - copied unchanged from r725663, directory/apacheds/branches/apacheds-mina2/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
      - copied unchanged from r725663, directory/apacheds/branches/apacheds-mina2/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
      - copied unchanged from r725642, directory/shared/branches/shared-mina2/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
      - copied unchanged from r725642, directory/shared/branches/shared-mina2/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
Removed:
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DatagramAcceptor.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/SocketAcceptor.java
Modified:
    directory/apacheds/trunk/all/pom.xml
    directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
    directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java
    directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.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/partition/PartitionIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java
    directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java
    directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/Schema.java
    directory/apacheds/trunk/core-splay/src/main/java/org/apache/directory/server/core/splay/LinkedBinaryNode.java
    directory/apacheds/trunk/core-splay/src/main/java/org/apache/directory/server/core/splay/SplayTree.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/CoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchema.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaObjectClassHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChangeHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java
    directory/apacheds/trunk/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BaseMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesAckMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/BeginLogEntriesMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesAckMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/EndLogEntriesMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryAckMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LogEntryMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginAckMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/LoginMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationClientProtocolCodecFactory.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ReplicationServerProtocolCodecFactory.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageDecoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/codec/ResponseMessageEncoder.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationContextHandler.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java
    directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/AbstractMessageCodecTest.java
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordTcpDecoder.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordTcpEncoder.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordTcpProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordUdpDecoder.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordUdpEncoder.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordUdpProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java
    directory/apacheds/trunk/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/DnsMessageDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/CanonicalNameRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/MailExchangeRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/NameServerRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/PointerRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/QuestionRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/RecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/ResourceRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/ServerSelectionRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/StartOfAuthorityRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/TextRecordEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolTcpCodecFactory.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolUdpCodecFactory.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsTcpDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsTcpEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsUdpDecoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsUdpEncoder.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AbstractResourceRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/CanonicalNameRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/MailExchangeRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/NameServerRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/PointerRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/QuestionRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/ServerSelectionRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/StartOfAuthorityRecordEncoderTest.java
    directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/TextRecordEncoderTest.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosTcpDecoder.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosTcpEncoder.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosTcpProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosUdpDecoder.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosUdpEncoder.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosUdpProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
    directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
    directory/apacheds/trunk/protocol-ldap/pom.xml
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSessionManager.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractMechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslFilter.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchCookie.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java
    directory/apacheds/trunk/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java
    directory/apacheds/trunk/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ProtocolService.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
    directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
    directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java
    directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java
    directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/NonExistentState.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
    directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
    directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
    directory/apacheds/trunk/server-xml/src/main/resources/server.xml
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
    directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.bat
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/archive/apacheds.sh
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
    directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
    directory/installers/trunk/pom.xml
    directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java
    directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixProvider.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/Provider.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/DateUtils.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/Position.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
    directory/shared/trunk/pom.xml

Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Thu Dec 11 07:32:04 2008
@@ -66,6 +66,31 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>app</shadedClassifierName>
+              <filters>
+                <filter>
+                  <artifact>bouncycastle:bcprov-jdk15</artifact>
+                  <excludes>
+                    <exclude>META-INF/BCKEY.SF</exclude>
+                    <exclude>META-INF/BCKEY.DSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
               <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
               <shadedArtifactAttached>false</shadedArtifactAttached>
             </configuration>

Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Thu Dec 11 07:32:04 2008
@@ -334,10 +334,40 @@
             }
 
 
+            /**
+             * {@inheritDoc}
+             */
             public boolean isDisabled()
             {
                 return false;
             }
+
+
+            /**
+             * {@inheritDoc}
+             */
+            public boolean isEnabled()
+            {
+                return true;
+            }
+            
+            
+
+
+            /**
+             * {@inheritDoc}
+             */
+            public void disable()
+            {
+            }
+
+
+            /**
+             * {@inheritDoc}
+             */
+            public void enable()
+            {
+            }
         };
 
         createSchemaAndContainers( other );

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java Thu Dec 11 07:32:04 2008
@@ -34,109 +34,109 @@
 public class AvlTree<K>
 {
     /** the root of the tree */
-	private LinkedAvlNode<K> root;
+    private LinkedAvlNode<K> root;
 
-	/** The Comparator used for comparing the keys */
-	private Comparator<K> comparator;
+    /** The Comparator used for comparing the keys */
+    private Comparator<K> comparator;
 
-	/** node representing the start of the doubly linked list formed with the tree nodes */
-	private LinkedAvlNode<K> first;
-	
-	/** node representing the end of the doubly linked list formed with the tree nodes */
+    /** node representing the start of the doubly linked list formed with the tree nodes */
+    private LinkedAvlNode<K> first;
+    
+    /** node representing the end of the doubly linked list formed with the tree nodes */
     private LinkedAvlNode<K> last;
 
 
     /**
-	 * Creates a new instance of AVLTree.
-	 *
-	 * @param comparator the comparator to be used for comparing keys
-	 */
-	public AvlTree( Comparator<K> comparator)
-	{
-	    this.comparator = comparator;
-	}
-	
-	
-	/**
-	 * @return the comparator associated with this tree 
-	 */
-	public Comparator<K> getComparator()
-	{
-	    return comparator;
-	}
-	
-	
-	/**
-	 * Inserts a LinkedAvlNode with the given key.
-	 *
-	 * @param key the item to be inserted
-	 * @return the replaced key if it already exists
-	 * Note: Ignores if a node with the given key already exists.
-	 */
-	public K insert( K key )
-	{
-	    LinkedAvlNode<K> node, temp;
-	    LinkedAvlNode<K> parent = null;
-	    int c;
-	    
-	    if ( root == null )
-	    {
-	      root = new LinkedAvlNode<K>( key );
-	      first = root;
-	      last = root;
-	      return null;
-	    }
-	    
-	    node = new LinkedAvlNode<K>( key );
-	    
-	    temp = root;
-	    
-	    List<LinkedAvlNode<K>> treePath = new ArrayList<LinkedAvlNode<K>>();
-
-	    while( temp != null )
-	    {
-	        treePath.add(0, temp ); // last node first, for the sake of balance factor computation
-	        parent = temp;
-	        
-	        c = comparator.compare( key, temp.getKey() );
-	        
-	        if( c == 0 )
-	        {
-	            return key; // key already exists
-	        }
-	        
-	        if( c < 0 )
-	        {
-	            temp.isLeft = true;
-	            temp = temp.getLeft();
-	        }
-	        else
-	        {
-	            temp.isLeft = false;
-	            temp = temp.getRight();
-	        }
-	    }
-	    
-	    if( ( c = comparator.compare( key, parent.getKey() ) ) < 0 )
-	    {
-	        parent.setLeft( node );
-	    }
-	    else
-	    {
-	        parent.setRight( node );
-	    }
-	    
+     * Creates a new instance of AVLTree.
+     *
+     * @param comparator the comparator to be used for comparing keys
+     */
+    public AvlTree( Comparator<K> comparator)
+    {
+        this.comparator = comparator;
+    }
+    
+    
+    /**
+     * @return the comparator associated with this tree 
+     */
+    public Comparator<K> getComparator()
+    {
+        return comparator;
+    }
+    
+    
+    /**
+     * Inserts a LinkedAvlNode with the given key.
+     *
+     * @param key the item to be inserted
+     * @return the replaced key if it already exists
+     * Note: Ignores if a node with the given key already exists.
+     */
+    public K insert( K key )
+    {
+        LinkedAvlNode<K> node, temp;
+        LinkedAvlNode<K> parent = null;
+        int c;
+        
+        if ( root == null )
+        {
+          root = new LinkedAvlNode<K>( key );
+          first = root;
+          last = root;
+          return null;
+        }
+        
+        node = new LinkedAvlNode<K>( key );
+        
+        temp = root;
+        
+        List<LinkedAvlNode<K>> treePath = new ArrayList<LinkedAvlNode<K>>();
+
+        while( temp != null )
+        {
+            treePath.add(0, temp ); // last node first, for the sake of balance factor computation
+            parent = temp;
+            
+            c = comparator.compare( key, temp.getKey() );
+            
+            if( c == 0 )
+            {
+                return key; // key already exists
+            }
+            
+            if( c < 0 )
+            {
+                temp.isLeft = true;
+                temp = temp.getLeft();
+            }
+            else
+            {
+                temp.isLeft = false;
+                temp = temp.getRight();
+            }
+        }
+        
+        if( ( c = comparator.compare( key, parent.getKey() ) ) < 0 )
+        {
+            parent.setLeft( node );
+        }
+        else
+        {
+            parent.setRight( node );
+        }
+        
         insertInList( node, parent, c );
         
         treePath.add( 0, node );
-	    balance(treePath);
-	    
-	    return null;
-	}
-	
-	
-	private void removeFromList(LinkedAvlNode<K> node)
-	{
+        balance(treePath);
+        
+        return null;
+    }
+    
+    
+    private void removeFromList(LinkedAvlNode<K> node)
+    {
         if( node.next == null && node.previous == null ) // should happen in case of tree having single node
         {
             first = last = null;
@@ -157,11 +157,11 @@
             node.next.previous = node.previous;
         }
         
-	}
-	
-	
-	private void insertInList(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode, int pos)
-	{
+    }
+    
+    
+    private void insertInList(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode, int pos)
+    {
 
         if( pos < 0 )
         {
@@ -198,10 +198,10 @@
             parentNode.next = node;
          }
         
-	}
-	
-	
-	/**
+    }
+    
+    
+    /**
      * Removes the LinkedAvlNode present in the tree with the given key value
      *
      * @param key the value of the node to be removed
@@ -308,26 +308,26 @@
     }
     
     
-	/**
-	 * Balances the tree by visiting the nodes present in the List of nodes present in the
-	 * treePath parameter.<br><br>
-	 *
-	 * This really does the balancing if the height of the tree is greater than 2 and the<br> 
-	 * balance factor is greater than +1 or less than -1.<br><br>
-	 * For an excellent info please read the 
-	 * <a href="http://en.wikipedia.org/wiki/Avl_tree">Wikipedia article on AVL tree</a>.
-	 * 
-	 * @param treePath the traversed list of LinkedAvlNodes after performing an insert/delete operation.
-	 */
-	private void balance( List<LinkedAvlNode<K>> treePath )
-	{
-	    LinkedAvlNode<K> parentNode = null;
-	    
-	    int size = treePath.size();
-	    
-	    for( LinkedAvlNode<K> node: treePath )
-	    {
-	        int balFactor = getBalance( node );
+    /**
+     * Balances the tree by visiting the nodes present in the List of nodes present in the
+     * treePath parameter.<br><br>
+     *
+     * This really does the balancing if the height of the tree is greater than 2 and the<br> 
+     * balance factor is greater than +1 or less than -1.<br><br>
+     * For an excellent info please read the 
+     * <a href="http://en.wikipedia.org/wiki/Avl_tree">Wikipedia article on AVL tree</a>.
+     * 
+     * @param treePath the traversed list of LinkedAvlNodes after performing an insert/delete operation.
+     */
+    private void balance( List<LinkedAvlNode<K>> treePath )
+    {
+        LinkedAvlNode<K> parentNode = null;
+        
+        int size = treePath.size();
+        
+        for( LinkedAvlNode<K> node: treePath )
+        {
+            int balFactor = getBalance( node );
 
             if( node != root )
             {
@@ -337,37 +337,37 @@
                 }
             }
 
-	        if( balFactor > 1 )
-	        {
-	            if( getBalance( node.right ) <= -1)
-	            {
-	                //------rotate double-left--------
-	                rotateSingleRight( node.right, node );
-	                rotateSingleLeft( node, parentNode );
-	            }
-	            else // rotate single-left
-	            {
-	               rotateSingleLeft( node, parentNode );
-	            }
-	        }
-	        else if( balFactor < -1 )
-	        {
-	            if( getBalance( node.left ) >= 1)
-	            {
-	               //------rotate double-right--------
-	               rotateSingleLeft( node.left, node ); 
-	               rotateSingleRight( node, parentNode );
-	            }
-	            else
-	            {
-	                rotateSingleRight( node, parentNode );
-	            }
-	        }
-	    }
-	}
-	
+            if( balFactor > 1 )
+            {
+                if( getBalance( node.right ) <= -1)
+                {
+                    //------rotate double-left--------
+                    rotateSingleRight( node.right, node );
+                    rotateSingleLeft( node, parentNode );
+                }
+                else // rotate single-left
+                {
+                   rotateSingleLeft( node, parentNode );
+                }
+            }
+            else if( balFactor < -1 )
+            {
+                if( getBalance( node.left ) >= 1)
+                {
+                   //------rotate double-right--------
+                   rotateSingleLeft( node.left, node ); 
+                   rotateSingleRight( node, parentNode );
+                }
+                else
+                {
+                    rotateSingleRight( node, parentNode );
+                }
+            }
+        }
+    }
+    
 
-	/**
+    /**
      * Tests if the tree is logically empty.
      * 
      * @return true if the tree is empty, false otherwise
@@ -498,15 +498,15 @@
     /**
      * @return The first element of this tree
      */
-	public LinkedAvlNode<K> getFirst()
+    public LinkedAvlNode<K> getFirst()
     {
         return first;
     }
 
-	
-	/**
-	 * @return The last element in this tree
-	 */
+    
+    /**
+     * @return The last element in this tree
+     */
     public LinkedAvlNode<K> getLast()
     {
         return last;
@@ -514,15 +514,15 @@
 
     
     /**
-	 * Rotate the node left side once.
-	 *
-	 * @param node the LinkedAvlNode to be rotated
-	 * @param parentNode parent LinkedAvlNode of node
-	 */
-	private void rotateSingleLeft(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode)
-	{
-	    LinkedAvlNode<K> temp;
-	    //------rotate single-left--------
+     * Rotate the node left side once.
+     *
+     * @param node the LinkedAvlNode to be rotated
+     * @param parentNode parent LinkedAvlNode of node
+     */
+    private void rotateSingleLeft(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode)
+    {
+        LinkedAvlNode<K> temp;
+        //------rotate single-left--------
         
         temp = node.right;
         node.right = temp.left;
@@ -543,18 +543,18 @@
                 parentNode.right = temp;
             }
         }
-	}
-	
-	
-	/**
+    }
+    
+    
+    /**
      * Rotate the node right side once.
      *
      * @param node the LinkedAvlNode to be rotated
      * @param parentNode parent LinkedAvlNode of node
      */
-	private void rotateSingleRight(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode)
-	{
-	    LinkedAvlNode<K> temp;
+    private void rotateSingleRight(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode)
+    {
+        LinkedAvlNode<K> temp;
         //------rotate single-right--------
         
         temp = node.left;
@@ -588,39 +588,39 @@
             }
             // no need to check for right node
         }
-	}
-		
+    }
+        
+
+    /**
+     * Detach a LinkedAvlNode from its parent
+     *
+     * @param node the LinkedAvlNode to be detached
+     * @param parentNode the parent LinkedAvlNode of the node
+     */
+    private void detachNodes(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode)
+    {
+        if( parentNode != null )
+        {
+            if( node == parentNode.left )
+            {
+                parentNode.left = node.left;
+            }
+            else if( node == parentNode.right )
+            {
+                parentNode.right = node.left;
+            }
+        }
+    }
+
 
-	/**
-	 * Detach a LinkedAvlNode from its parent
-	 *
-	 * @param node the LinkedAvlNode to be detached
-	 * @param parentNode the parent LinkedAvlNode of the node
-	 */
-	private void detachNodes(LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode)
-	{
-	    if( parentNode != null )
-	    {
-	        if( node == parentNode.left )
-	        {
-	            parentNode.left = node.left;
-	        }
-	        else if( node == parentNode.right )
-	        {
-	            parentNode.right = node.left;
-	        }
-	    }
-	}
-
-
-	/**
-	 * 
-	 * Replace a LinkedAvlNode to be removed with a new existing LinkedAvlNode 
-	 *
-	 * @param deleteNode the LinkedAvlNode to be deleted
-	 * @param replaceNode the LinkedAvlNode to replace the deleteNode
-	 * @param parentNode the parent LinkedAvlNode of deleteNode
-	 */
+    /**
+     * 
+     * Replace a LinkedAvlNode to be removed with a new existing LinkedAvlNode 
+     *
+     * @param deleteNode the LinkedAvlNode to be deleted
+     * @param replaceNode the LinkedAvlNode to replace the deleteNode
+     * @param parentNode the parent LinkedAvlNode of deleteNode
+     */
     private void replaceNode(LinkedAvlNode<K> deleteNode, LinkedAvlNode<K> replaceNode, LinkedAvlNode<K> parentNode)
     {
         if( parentNode != null )
@@ -847,37 +847,37 @@
      * @param startNode starting node of a subtree/tree
      * @return the list of traversed LinkedAvlNodes.
      */
-	private List<LinkedAvlNode<K>> findMax( LinkedAvlNode<K> startNode )
-	{
-	    LinkedAvlNode<K> x = startNode;
-	    LinkedAvlNode<K> y = null;
-	    List<LinkedAvlNode<K>> path;
-	    
-	    if( x == null )
-	    {
-	        return null;
-	    }
-	    
-	    while( x.right != null )
-	    {
-	        x.isLeft = false;
-	        y = x;
-	        x = x.right;
-	    }
-	    
-	    path = new ArrayList<LinkedAvlNode<K>>(2);
-	    path.add( x );
-	    
-	    if ( y != null )
-	    {
-	      path.add( y );  
-	    }
-	    
-	    return path;
-	}
+    private List<LinkedAvlNode<K>> findMax( LinkedAvlNode<K> startNode )
+    {
+        LinkedAvlNode<K> x = startNode;
+        LinkedAvlNode<K> y = null;
+        List<LinkedAvlNode<K>> path;
+        
+        if( x == null )
+        {
+            return null;
+        }
+        
+        while( x.right != null )
+        {
+            x.isLeft = false;
+            y = x;
+            x = x.right;
+        }
+        
+        path = new ArrayList<LinkedAvlNode<K>>(2);
+        path.add( x );
+        
+        if ( y != null )
+        {
+          path.add( y );  
+        }
+        
+        return path;
+    }
 
-	
-	/**
+    
+    /**
      * Find the LinkedAvlNode having the min key value in the tree starting from the startNode.
      *
      * @param startNode starting node of a subtree/tree
@@ -919,16 +919,16 @@
      * @param node a LinkedAvlNode 
      * @return balance-factor of the node
      */
-	private int getBalance( LinkedAvlNode<K> node )
-	{
-	    if( node == null)
-	    {
-	        return 0;
-	    }
-	    
-	    return node.getBalance();
-	}
-	
+    private int getBalance( LinkedAvlNode<K> node )
+    {
+        if( node == null)
+        {
+            return 0;
+        }
+        
+        return node.getBalance();
+    }
+    
     
     private void visit( LinkedAvlNode<K> node, LinkedAvlNode<K> parentNode ) 
     {

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java Thu Dec 11 07:32:04 2008
@@ -63,7 +63,7 @@
     }
 
 
-	public void setLeft( LinkedAvlNode<T> left )
+    public void setLeft( LinkedAvlNode<T> left )
     {
         this.left = left;
     }
@@ -88,37 +88,37 @@
 
 
     public LinkedAvlNode<T> getLeft() {
-		return left;
-	}
+        return left;
+    }
 
 
-	public LinkedAvlNode<T> getRight() {
-		return right;
-	}
+    public LinkedAvlNode<T> getRight() {
+        return right;
+    }
 
-	public T getKey() {
-		return key;
-	}
+    public T getKey() {
+        return key;
+    }
 
-	public boolean isLeaf()
-	{
-		return ( right == null && left == null );
-	}
-	
-	public int getDepth() {
-		return depth;
-	}
+    public boolean isLeaf()
+    {
+        return ( right == null && left == null );
+    }
+    
+    public int getDepth() {
+        return depth;
+    }
 
-	public void setDepth( int depth ) {
-		this.depth = depth;
-	}
+    public void setDepth( int depth ) {
+        this.depth = depth;
+    }
 
-	public int getHeight()
+    public int getHeight()
     {
-	    return height;
+        return height;
     }
-	
-	
+    
+    
    public void setNext( LinkedAvlNode<T> next )
    {
       this.next = next;
@@ -127,11 +127,11 @@
    
    public void setPrevious( LinkedAvlNode<T> previous )
    {
-	  this.previous = previous;
-   }	
+      this.previous = previous;
+   }    
    
    
-	public int computeHeight()
+    public int computeHeight()
     {
 
         if(right == null && left == null)
@@ -157,10 +157,10 @@
         
         return height;
     }
-	
-	public int getBalance()
+    
+    public int getBalance()
     {
-	    int lh = ( left == null ? 0 : left.computeHeight() );
+        int lh = ( left == null ? 0 : left.computeHeight() );
         int rh = ( right == null ? 0 : right.computeHeight() );
         
         return ( rh - lh );
@@ -178,8 +178,8 @@
 
 
     @Override
-	public String toString() {
-	    return "[" + key + "]";
-	}
+    public String toString() {
+        return "[" + key + "]";
+    }
     
 }

Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreePerfTest.java Thu Dec 11 07:32:04 2008
@@ -246,7 +246,7 @@
     
     
     @SuppressWarnings("unchecked")
-	@Test
+    @Test
     public void testRBTreeDeserializationPerf() throws Exception
     {
      // read test

Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java Thu Dec 11 07:32:04 2008
@@ -449,8 +449,8 @@
     
     
     /**
-	 * @see Object#equals(Object);
-	 */
+     * @see Object#equals(Object);
+     */
     public boolean equals( Object obj )
     {
         // Short circuit

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java Thu Dec 11 07:32:04 2008
@@ -57,7 +57,7 @@
 @RunWith ( CiRunner.class )
 public class SimpleBindIT
 {
-	/** The directory service */
+    /** The directory service */
     public static DirectoryService service;
     
     /**
@@ -85,38 +85,38 @@
     @Test
     public void testSimpleBindUserPassword()
     {
-    	// We will bind using JNDI
-    	// Set up the environment for creating the initial context
+        // We will bind using JNDI
+        // Set up the environment for creating the initial context
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( DirectoryService.JNDI_KEY, service );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
 
-    	// Authenticate as admin and password "secret"
-    	env.put(Context.SECURITY_AUTHENTICATION, "simple");
-    	env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system");
-    	env.put(Context.SECURITY_CREDENTIALS, "secret");
-
-    	DirContext ctx = null;
-    	
-    	// Create the initial context
-    	try
-    	{
-    		ctx = new InitialDirContext(env);
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
-    	
-    	try
-    	{
-    		ctx.close();
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
+        // Authenticate as admin and password "secret"
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system");
+        env.put(Context.SECURITY_CREDENTIALS, "secret");
+
+        DirContext ctx = null;
+        
+        // Create the initial context
+        try
+        {
+            ctx = new InitialDirContext(env);
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
+        
+        try
+        {
+            ctx.close();
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
     }
     
     
@@ -128,34 +128,34 @@
     @Test
     public void testSimpleBindUserBadPassword()
     {
-    	// We will bind using JNDI
-    	// Set up the environment for creating the initial context
+        // We will bind using JNDI
+        // Set up the environment for creating the initial context
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( DirectoryService.JNDI_KEY, service );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
 
-    	// Authenticate as admin and password "badsecret"
-    	env.put(Context.SECURITY_AUTHENTICATION, "simple");
-    	env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system");
-    	env.put(Context.SECURITY_CREDENTIALS, "badsecret");
-
-    	// Create the initial context
-    	try
-    	{
-    		new InitialDirContext(env);
-
-        	// We should not be connected
-    		fail();
-    	}
-    	catch ( LdapAuthenticationException lae )
-    	{
-    		assertTrue( true );
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
+        // Authenticate as admin and password "badsecret"
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system");
+        env.put(Context.SECURITY_CREDENTIALS, "badsecret");
+
+        // Create the initial context
+        try
+        {
+            new InitialDirContext(env);
+
+            // We should not be connected
+            fail();
+        }
+        catch ( LdapAuthenticationException lae )
+        {
+            assertTrue( true );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
     }
     
     
@@ -167,34 +167,34 @@
     @Test
     public void testSimpleBindBadUserPassword()
     {
-    	// We will bind using JNDI
-    	// Set up the environment for creating the initial context
+        // We will bind using JNDI
+        // Set up the environment for creating the initial context
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( DirectoryService.JNDI_KEY, service );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
 
-    	// Authenticate as admin and password "secret"
-    	env.put(Context.SECURITY_AUTHENTICATION, "simple");
-    	env.put(Context.SECURITY_PRINCIPAL, "admin");
-    	env.put(Context.SECURITY_CREDENTIALS, "secret");
-
-    	// Create the initial context
-    	try
-    	{
-    		new InitialDirContext(env);
-
-        	// We should not be connected
-    		fail();
-    	}
-    	catch ( InvalidNameException ine )
-    	{
-    		assertEquals( "Bad DN : admin", ine.getMessage() );
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
+        // Authenticate as admin and password "secret"
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "admin");
+        env.put(Context.SECURITY_CREDENTIALS, "secret");
+
+        // Create the initial context
+        try
+        {
+            new InitialDirContext(env);
+
+            // We should not be connected
+            fail();
+        }
+        catch ( InvalidNameException ine )
+        {
+            assertEquals( "Bad DN : admin", ine.getMessage() );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
     }
     
 
@@ -206,34 +206,34 @@
     @Test
     public void testSimpleBindUnknowUserPassword()
     {
-    	// We will bind using JNDI
-    	// Set up the environment for creating the initial context
+        // We will bind using JNDI
+        // Set up the environment for creating the initial context
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( DirectoryService.JNDI_KEY, service );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
 
-    	// Authenticate as uid=unknown and password "secret"
-    	env.put(Context.SECURITY_AUTHENTICATION, "simple");
-    	env.put(Context.SECURITY_PRINCIPAL, "uid=unknown,ou=system");
-    	env.put(Context.SECURITY_CREDENTIALS, "secret");
-
-    	// Create the initial context
-    	try
-    	{
-    		new InitialDirContext(env);
-
-        	// We should not be connected
-    		fail();
-    	}
-    	catch ( LdapAuthenticationException lae )
-    	{
-    		assertEquals( "Cannot authenticate user uid=unknown,ou=system", lae.getMessage() );
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
+        // Authenticate as uid=unknown and password "secret"
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "uid=unknown,ou=system");
+        env.put(Context.SECURITY_CREDENTIALS, "secret");
+
+        // Create the initial context
+        try
+        {
+            new InitialDirContext(env);
+
+            // We should not be connected
+            fail();
+        }
+        catch ( LdapAuthenticationException lae )
+        {
+            assertEquals( "Cannot authenticate user uid=unknown,ou=system", lae.getMessage() );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
     }
     
     
@@ -245,8 +245,8 @@
     @Test
     public void testSimpleBindNoUserNoPassword()
     {
-    	// We will bind using JNDI
-    	// Set up the environment for creating the initial context
+        // We will bind using JNDI
+        // Set up the environment for creating the initial context
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( DirectoryService.JNDI_KEY, service );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
@@ -254,63 +254,63 @@
         // Bind on the rootDSE
         env.put( Context.PROVIDER_URL, "" );
 
-    	// Authenticate as admin and password "secret"
-    	env.put(Context.SECURITY_AUTHENTICATION, "simple");
-    	env.put(Context.SECURITY_PRINCIPAL, "");
-    	env.put(Context.SECURITY_CREDENTIALS, "");
-
-    	DirContext ctx = null;
-    	
-    	// Create the initial context
-    	try
-    	{
-    		ctx = new InitialDirContext(env);
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
-    	
-    	// We should be anonymous here. 
-    	// Check that we can read the rootDSE
-    	try
-    	{
-    		NamingEnumeration<SearchResult> list = search( ctx, "", "(ObjectClass=*)", SearchControls.OBJECT_SCOPE );
-    		
-    		assertNotNull( list );
-    		
+        // Authenticate as admin and password "secret"
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "");
+        env.put(Context.SECURITY_CREDENTIALS, "");
+
+        DirContext ctx = null;
+        
+        // Create the initial context
+        try
+        {
+            ctx = new InitialDirContext(env);
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
+        
+        // We should be anonymous here. 
+        // Check that we can read the rootDSE
+        try
+        {
+            NamingEnumeration<SearchResult> list = search( ctx, "", "(ObjectClass=*)", SearchControls.OBJECT_SCOPE );
+            
+            assertNotNull( list );
+            
             while ( list.hasMore() )
             {
                 SearchResult result = list.next();
                 assertNotNull( result );
             }
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
-
-    	// Check that we cannot read another entry being anonymous
-    	try
-    	{
-    		NamingEnumeration<SearchResult> list = search( ctx, "uid=admin, ou=system", "(ObjectClass=*)", SearchControls.OBJECT_SCOPE );
-    		
-    		assertNotNull( list );
-    		assertFalse( list.hasMore() );
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
-
-    	try
-    	{
-    		ctx.close();
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
+
+        // Check that we cannot read another entry being anonymous
+        try
+        {
+            NamingEnumeration<SearchResult> list = search( ctx, "uid=admin, ou=system", "(ObjectClass=*)", SearchControls.OBJECT_SCOPE );
+            
+            assertNotNull( list );
+            assertFalse( list.hasMore() );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
+
+        try
+        {
+            ctx.close();
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
     }
     
     
@@ -322,8 +322,8 @@
     @Test
     public void testSimpleBindUserNoPassword()
     {
-    	// We will bind using JNDI
-    	// Set up the environment for creating the initial context
+        // We will bind using JNDI
+        // Set up the environment for creating the initial context
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( DirectoryService.JNDI_KEY, service );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
@@ -331,24 +331,24 @@
         // Bind on the rootDSE
         env.put( Context.PROVIDER_URL, "" );
 
-    	// Authenticate as admin and password "secret"
-    	env.put(Context.SECURITY_AUTHENTICATION, "simple");
-    	env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system");
-    	env.put(Context.SECURITY_CREDENTIALS, "");
-
-    	// Create the initial context
-    	try
-    	{
-    		new InitialDirContext(env);
-    	}
-    	catch ( OperationNotSupportedException onse )
-    	{
-    		assertEquals( "Cannot Bind for DN uid=admin,ou=system", onse.getMessage() );
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
+        // Authenticate as admin and password "secret"
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system");
+        env.put(Context.SECURITY_CREDENTIALS, "");
+
+        // Create the initial context
+        try
+        {
+            new InitialDirContext(env);
+        }
+        catch ( OperationNotSupportedException onse )
+        {
+            assertEquals( "Cannot Bind for DN uid=admin,ou=system", onse.getMessage() );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
     }
     
     
@@ -360,8 +360,8 @@
     @Test
     public void testSimpleBindNoUserPassword() throws Exception
     {
-    	// We will bind using JNDI
-    	// Set up the environment for creating the initial context
+        // We will bind using JNDI
+        // Set up the environment for creating the initial context
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( DirectoryService.JNDI_KEY, service );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
@@ -369,23 +369,23 @@
         // Bind on the rootDSE
         env.put( Context.PROVIDER_URL, "" );
 
-    	// Authenticate as admin and password "secret"
-    	env.put(Context.SECURITY_AUTHENTICATION, "simple");
-    	env.put(Context.SECURITY_PRINCIPAL, "");
-    	env.put(Context.SECURITY_CREDENTIALS, "secret");
-
-    	// Create the initial context
-    	try
-    	{
-    		new InitialDirContext(env);
-    	}
-    	catch ( LdapNameNotFoundException lnnfe )
-    	{
-    		assertTrue( true );
-    	}
-    	catch ( NamingException ne )
-    	{
-    		fail();
-    	}
+        // Authenticate as admin and password "secret"
+        env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        env.put(Context.SECURITY_PRINCIPAL, "");
+        env.put(Context.SECURITY_CREDENTIALS, "secret");
+
+        // Create the initial context
+        try
+        {
+            new InitialDirContext(env);
+        }
+        catch ( LdapNameNotFoundException lnnfe )
+        {
+            assertTrue( true );
+        }
+        catch ( NamingException ne )
+        {
+            fail();
+        }
     }
 }

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=725712&r1=725711&r2=725712&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 Thu Dec 11 07:32:04 2008
@@ -55,7 +55,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
+ 
 
 /**
  * Tests the search() methods of the provider.
@@ -486,8 +486,8 @@
             {
                 SearchResult result = ( SearchResult ) list.next();
                 
-                // leep 201 ms before fetching the next element ...
-            	Thread.sleep( 201 );
+                // Sleep 201 ms before fetching the next element ...
+                Thread.sleep( 201 );
                 map.put( result.getName(), result.getAttributes() );
             }
             
@@ -1278,19 +1278,20 @@
 
         ctx = ( DirContext ) sysRoot.lookup( "cn=Sid Vicious" );
         assertNotNull( ctx );
-
+        
         Attributes attributes = ctx.getAttributes( "" );
-
+        
         assertEquals( "(sex*pis\\tols)", attributes.get( "description" ).get() );
 
         // Now, search for the description
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
+
         controls.setReturningAttributes( new String[]
-            { "*" } );
+                    { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
-            .getJndiValue() );
+                     .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration<SearchResult> list = sysRoot
@@ -1309,8 +1310,8 @@
         assertNotNull( attrs.get( "objectClass" ) );
         assertNotNull( attrs.get( "cn" ) );
     }
-
-
+    
+    
     @Test
     public void testSubstringSearchWithEscapedCharsInFilter() throws Exception
     {

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Thu Dec 11 07:32:04 2008
@@ -80,8 +80,8 @@
      */
     public static class Factory implements DirectoryServiceFactory
     {
-		public DirectoryService newInstance() throws Exception 
-		{
+        public DirectoryService newInstance() throws Exception 
+        {
             DirectoryService service = new DefaultDirectoryService();
             service.getChangeLog().setEnabled( true );
             
@@ -96,7 +96,7 @@
             service.addPartition( bar );
             
             return service;
-		}
+        }
     }
     
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Thu Dec 11 07:32:04 2008
@@ -599,12 +599,12 @@
         
         try
         {
-        	getSchemaContext( service ).createSubcontext( dn, attrs );
-        	fail();
+            getSchemaContext( service ).createSubcontext( dn, attrs );
+            fail();
         }
         catch ( NamingException ne )
         {
-        	assertTrue( true );
+            assertTrue( true );
         }
     }
     
@@ -638,12 +638,12 @@
         
         try
         {
-        	getSchemaContext( service ).createSubcontext( dn, attrs );
-        	fail();
+            getSchemaContext( service ).createSubcontext( dn, attrs );
+            fail();
         }
         catch ( NamingException ne )
         {
-        	assertTrue( true );
+            assertTrue( true );
         }
     }
     
@@ -740,12 +740,12 @@
         
         try
         {
-        	getSchemaContext( service ).createSubcontext( dn, attrs );
-        	fail();
+            getSchemaContext( service ).createSubcontext( dn, attrs );
+            fail();
         }
         catch ( NamingException ne )
         {
-        	assertTrue( true );
+            assertTrue( true );
         }
     }
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Thu Dec 11 07:32:04 2008
@@ -62,9 +62,11 @@
 public class MetaSchemaHandlerIT
 {
     /** the schema to use for this test: one that is not loaded by default */
-    private static final String TEST_SCHEMA = "nis";
+    private static final String NIS_SCHEMA = "nis";
+    
     /** a test attribute in the test schema: uidNumber in nis schema */
     private static final String TEST_ATTR_OID = "1.3.6.1.1.1.1.0";
+    
     /** the name of the dummy schema to test metaSchema adds/deletes with */
     private static final String DUMMY_SCHEMA = "dummy";
     
@@ -96,6 +98,9 @@
         attributes = schemaRoot.getAttributes( "ou=attributeTypes,cn=samba" );
         assertNotNull( attributes );
         assertTrue( attributes.get( SchemaConstants.OU_AT ).contains( "attributetypes" ) );
+        
+        // Disable the NIS schema
+        disableSchema( "nis" );
     }
 
 
@@ -139,7 +144,7 @@
         dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
         dummySchema.put( "cn", DUMMY_SCHEMA );
         dummySchema.put( MetaSchemaConstants.M_DISABLED_AT, "TRUE" );
-        dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, TEST_SCHEMA );
+        dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, NIS_SCHEMA );
         dummySchema.get( MetaSchemaConstants.M_DEPENDENCIES_AT ).add( "core" );
         schemaRoot.createSubcontext( "cn=" + DUMMY_SCHEMA, dummySchema );
         
@@ -221,7 +226,7 @@
         Attributes dummySchema = new BasicAttributes( "objectClass", "top", true );
         dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
         dummySchema.put( "cn", DUMMY_SCHEMA );
-        dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, TEST_SCHEMA );
+        dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, NIS_SCHEMA );
         
         try
         {
@@ -290,7 +295,7 @@
         ModificationItem[] mods = new ModificationItem[1];
         mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
                 new BasicAttribute( MetaSchemaConstants.M_DEPENDENCIES_AT, DUMMY_SCHEMA ) );
-        schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
+        schemaRoot.modifyAttributes( "cn=" + NIS_SCHEMA, mods );
         
         // attempt to delete it now & it should fail
         try
@@ -377,6 +382,28 @@
     
     
     /**
+     * A helper method which tells if a schema is disabled
+     */
+    private boolean isDisabled( String schemaName )
+    {
+        Schema schema = getLoadedSchemas().get( schemaName );
+        
+        return ( schema == null ) || ( schema.isDisabled() );
+    }
+    
+    
+    /**
+     * A helper method which tells if a schema is enabled
+     */
+    private boolean isEnabled( String schemaName )
+    {
+        Schema schema = getLoadedSchemas().get( schemaName );
+        
+        return ( schema != null ) && ( !schema.isDisabled() );
+    }
+    
+    
+    /**
      * Checks to make sure updates enabling a metaSchema object in
      * the schema partition triggers the loading of that schema into
      * the global registries.
@@ -389,7 +416,37 @@
         AttributeTypeRegistry atr = getAttributeTypeRegistry();
         
         // check that the nis schema is not loaded
-        assertNull( getLoadedSchemas().get( TEST_SCHEMA ) );
+        assertTrue( isDisabled( NIS_SCHEMA ) );
+        
+        // double check and make sure an attribute from that schema is 
+        // not in the AttributeTypeRegistry
+        assertFalse( atr.hasAttributeType( TEST_ATTR_OID ) );
+        
+        // now enable the test schema
+        enableSchema( "nis" );
+        
+        // now test that the schema is loaded 
+        assertTrue( isEnabled( NIS_SCHEMA ) );
+        
+        // double check and make sure the test attribute from the 
+        // test schema is now loaded and present within the attr registry
+        assertTrue( atr.hasAttributeType( TEST_ATTR_OID ) );
+    }
+
+
+    /**
+     * Checks to make sure that if we try to enable an already enabled
+     * schema, we don't do anything.
+     *
+     * @throws Exception on error
+     */
+    @Test
+    public void testEnableSchemaAlreadyEnabled() throws Exception
+    {
+        AttributeTypeRegistry atr = getAttributeTypeRegistry();
+        
+        // check that the nis schema is not loaded
+        assertTrue( isDisabled( NIS_SCHEMA ) );
         
         // double check and make sure an attribute from that schema is 
         // not in the AttributeTypeRegistry
@@ -398,15 +455,54 @@
         // now enable the test schema
         enableSchema( "nis" );
         
+        // and enable it again (it should not do anything)
+        enableSchema( "nis" );
+        
         // now test that the schema is loaded 
-        assertNotNull( getLoadedSchemas().get( TEST_SCHEMA ) );
+        assertTrue( isEnabled( NIS_SCHEMA ) );
         
         // double check and make sure the test attribute from the 
         // test schema is now loaded and present within the attr registry
         assertTrue( atr.hasAttributeType( TEST_ATTR_OID ) );
     }
 
+    
+    /**
+     * Checks to make sure that if we try to disable an already disabled
+     * schema, we don't do anything.
+     *
+     * @throws Exception on error
+     */
+    @Test
+    public void testDisableSchemaAlreadyDisabled() throws Exception
+    {
+        AttributeTypeRegistry atr = getAttributeTypeRegistry();
+        
+        // check that the nis schema is not loaded
+        assertTrue( isDisabled( NIS_SCHEMA ) );
+        
+        // double check and make sure an attribute from that schema is 
+        // not in the AttributeTypeRegistry
+        assertFalse( atr.hasAttributeType( TEST_ATTR_OID ) );
+        
+        // now disable the test schema
+        disableSchema( "nis" );
+        
+        // now test that the schema is loaded 
+        assertTrue( isDisabled( NIS_SCHEMA ) );
+        
+        // and disable it again (it should not do anything)
+        disableSchema( "nis" );
+        
+        // and test again that the schema is still disabled
+        assertTrue( isDisabled( NIS_SCHEMA ) );
+        
+        // double check and make sure the test attribute from the 
+        // test schema is now loaded and present within the attr registry
+        assertFalse( atr.hasAttributeType( TEST_ATTR_OID ) );
+    }
 
+    
     /**
      * Checks to make sure an attempt to disable a metaSchema fails if 
      * that schema has dependents which are enabled.
@@ -421,8 +517,8 @@
         
         AttributeTypeRegistry atr = getAttributeTypeRegistry();
         
-        // check that the nis schema is loaded
-        assertNotNull( getLoadedSchemas().get( TEST_SCHEMA ) );
+        // check that the nis schema is enabled
+        assertTrue( isEnabled( NIS_SCHEMA ) );
         
         // double check and make sure an attribute from that schema is 
         // in the AttributeTypeRegistry
@@ -433,7 +529,7 @@
         disableSchema( "nis" );
         
         // now test that the schema is NOT loaded 
-        assertNull( getLoadedSchemas().get( TEST_SCHEMA ) );
+        assertTrue( isDisabled( NIS_SCHEMA ) );
         
         // double check and make sure the test attribute from the test  
         // schema is now NOT loaded and present within the attr registry
@@ -463,11 +559,11 @@
         Attributes dummySchema = new BasicAttributes( "objectClass", "top", true );
         dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
         dummySchema.put( "cn", DUMMY_SCHEMA );
-        dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, TEST_SCHEMA );
+        dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, NIS_SCHEMA );
         schemaRoot.createSubcontext( "cn=" + DUMMY_SCHEMA, dummySchema );
         
         // check that the nis schema is loaded and the dummy schema is loaded
-        assertNotNull( getLoadedSchemas().get( TEST_SCHEMA ) );
+        assertTrue( isEnabled( NIS_SCHEMA ) );
         assertNotNull( getLoadedSchemas().get( DUMMY_SCHEMA ) );
         
         AttributeTypeRegistry atr = getAttributeTypeRegistry();
@@ -493,7 +589,7 @@
         }
         
         // now test that both schema are still loaded 
-        assertNotNull( getLoadedSchemas().get( TEST_SCHEMA ) );
+        assertTrue( isEnabled( NIS_SCHEMA ) );
         assertNotNull( getLoadedSchemas().get( DUMMY_SCHEMA ) );
         
         // double check and make sure the test attribute from the test  
@@ -631,7 +727,7 @@
         
         try
         {
-            schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
+            schemaRoot.modifyAttributes( "cn=" + NIS_SCHEMA, mods );
             fail( "Should not be able to add bogus dependency to schema" );
         }
         catch ( LdapOperationNotSupportedException e )
@@ -653,14 +749,14 @@
     public void testRejectAddOfDisabledDependencyToEnabledSchema() throws Exception
     {
         LdapContext schemaRoot = getSchemaContext( service );
-        enableSchema( TEST_SCHEMA );
+        enableSchema( NIS_SCHEMA );
         ModificationItem[] mods = new ModificationItem[1];
         Attribute attr = new BasicAttribute( "m-dependencies", "mozilla" );
         mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
         
         try
         {
-            schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
+            schemaRoot.modifyAttributes( "cn=" + NIS_SCHEMA, mods );
             fail( "Should not be able to add disabled dependency to schema" );
         }
         catch ( LdapOperationNotSupportedException e )
@@ -683,8 +779,8 @@
         ModificationItem[] mods = new ModificationItem[1];
         Attribute attr = new BasicAttribute( "m-dependencies", "mozilla" );
         mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
-        schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
-        Attributes attrs = schemaRoot.getAttributes( "cn=" + TEST_SCHEMA );
+        schemaRoot.modifyAttributes( "cn=" + NIS_SCHEMA, mods );
+        Attributes attrs = schemaRoot.getAttributes( "cn=" + NIS_SCHEMA );
         Attribute dependencies = attrs.get( "m-dependencies" );
         assertTrue( dependencies.contains( "mozilla" ) );
     }
@@ -703,8 +799,8 @@
         ModificationItem[] mods = new ModificationItem[1];
         Attribute attr = new BasicAttribute( "m-dependencies", "java" );
         mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
-        schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
-        Attributes attrs = schemaRoot.getAttributes( "cn=" + TEST_SCHEMA );
+        schemaRoot.modifyAttributes( "cn=" + NIS_SCHEMA, mods );
+        Attributes attrs = schemaRoot.getAttributes( "cn=" + NIS_SCHEMA );
         Attribute dependencies = attrs.get( "m-dependencies" );
         assertTrue( dependencies.contains( "java" ) );
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java?rev=725712&r1=725711&r2=725712&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java Thu Dec 11 07:32:04 2008
@@ -72,6 +72,7 @@
         AddIT.class,
         CreateContextIT.class,
         DestroyContextIT.class,
+        PartitionConfigurationIT.class,
         DIRSERVER169IT.class,
         DIRSERVER759IT.class,
         DIRSERVER783IT.class,
@@ -94,8 +95,7 @@
         SubentryServiceIT.class,
         LdapClassLoaderIT.class,
         NormalizationServiceIT.class,
-        DefaultChangeLogIT.class,
-        PartitionConfigurationIT.class  // Leaves the server in a bad state (partition removal is incomplete)
+        DefaultChangeLogIT.class
         } )
 @CleanupLevel ( Level.SUITE )
 @Mode ( SetupMode.ROLLBACK )



Mime
View raw message