From commits-return-9246-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Jun 14 01:16:20 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 54068 invoked from network); 14 Jun 2006 01:16:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jun 2006 01:16:09 -0000 Received: (qmail 51110 invoked by uid 500); 14 Jun 2006 01:16:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 50969 invoked by uid 500); 14 Jun 2006 01:16:03 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 50943 invoked by uid 99); 14 Jun 2006 01:16:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 18:16:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 18:15:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0796E1A983A; Tue, 13 Jun 2006 18:15:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r414015 [1/5] - in /directory/trunks/shared: ./ asn1/ asn1/src/main/java/org/apache/directory/shared/asn1/ber/ asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/ ldap/ ldap/src/main/antlr/ ldap/src/main/java/org/apache/directo... Date: Wed, 14 Jun 2006 01:15:18 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060614011537.0796E1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Tue Jun 13 18:15:12 2006 New Revision: 414015 URL: http://svn.apache.org/viewvc?rev=414015&view=rev Log: Merging back changes from optimization branch: all changes from 411287 up have been merged back into the trunk. Added: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NormalizerMappingResolver.java - copied unchanged from r414012, directory/branches/shared/optimization/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NormalizerMappingResolver.java Removed: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnOidContainer.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnParser.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapName.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DnComparator.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DnNormalizer.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DnSyntaxChecker.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapDnNormalizer.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapNameTest.java Modified: directory/trunks/shared/ (props changed) directory/trunks/shared/asn1/ (props changed) directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java directory/trunks/shared/ldap/ (props changed) directory/trunks/shared/ldap/src/main/antlr/ACIItem.g directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlValueAction.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownDecoder.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/FilterGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/MatchingRuleAssertionGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilterGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/AttributeTypeAndValue.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/NameComponentNormalizer.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/name/SimpleNameComponentNormalizer.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/OidNormalizer.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParser.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/NamespaceTools.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserDIRSERVER_584_Test.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDnParserTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/util/NamespaceToolsTest.java Propchange: directory/trunks/shared/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Jun 13 18:15:12 2006 @@ -0,0 +1,7 @@ +*.ipr +*.iws +' to '*.iml +*.ipr +*.iws +nbproject + Propchange: directory/trunks/shared/asn1/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 18:15:12 2006 @@ -14,3 +14,5 @@ classes bin build + +nbproject Modified: directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java (original) +++ directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java Tue Jun 13 18:15:12 2006 @@ -32,6 +32,8 @@ import java.nio.ByteBuffer; +import javax.naming.NamingException; + /** * A BER TLV Tag component decoder. This decoder instanciate a Tag. The tag @@ -296,7 +298,7 @@ * @throws DecoderException * Thrown if anything went wrong */ - private void treatTagEndState( IAsn1Container container ) throws DecoderException + private void treatTagEndState( IAsn1Container container ) throws DecoderException, NamingException { if ( log.isDebugEnabled() ) @@ -738,7 +740,7 @@ * @throws DecoderException * Thrown if anything went wrong */ - private boolean treatTLVDoneState( ByteBuffer stream, IAsn1Container container ) throws DecoderException + private boolean treatTLVDoneState( ByteBuffer stream, IAsn1Container container ) throws DecoderException, NamingException { if ( log.isDebugEnabled() ) { @@ -845,7 +847,7 @@ * @throws DecoderException * Thrown if anything went wrong! */ - public void decode( ByteBuffer stream, IAsn1Container container ) throws DecoderException + public void decode( ByteBuffer stream, IAsn1Container container ) throws DecoderException, NamingException { /* Modified: directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java (original) +++ directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java Tue Jun 13 18:15:12 2006 @@ -17,6 +17,8 @@ package org.apache.directory.shared.asn1.ber.grammar; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.Asn1Object; import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.tlv.TLV; @@ -150,7 +152,7 @@ * @throws DecoderException * Thrown if anything went wrong */ - public void executeAction( IAsn1Container container ) throws DecoderException + public void executeAction( IAsn1Container container ) throws DecoderException, NamingException { int currentState = container.getTransition(); Modified: directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java (original) +++ directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java Tue Jun 13 18:15:12 2006 @@ -17,6 +17,8 @@ package org.apache.directory.shared.asn1.ber.grammar; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.codec.DecoderException; @@ -40,5 +42,5 @@ * @throws DecoderException * Thrown if something went wrong. */ - public void action( IAsn1Container container ) throws DecoderException; + public void action( IAsn1Container container ) throws DecoderException, NamingException; } Modified: directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java (original) +++ directory/trunks/shared/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java Tue Jun 13 18:15:12 2006 @@ -17,6 +17,8 @@ package org.apache.directory.shared.asn1.ber.grammar; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.codec.DecoderException; @@ -40,7 +42,7 @@ * @throws DecoderException * Thrown when an unrecoverable error occurs. */ - void executeAction( IAsn1Container asn1Container ) throws DecoderException; + void executeAction( IAsn1Container asn1Container ) throws DecoderException, NamingException; /** Propchange: directory/trunks/shared/ldap/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 18:15:12 2006 @@ -10,3 +10,5 @@ .project .classpath *~ + +nbproject Modified: directory/trunks/shared/ldap/src/main/antlr/ACIItem.g URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/antlr/ACIItem.g?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/antlr/ACIItem.g (original) +++ directory/trunks/shared/ldap/src/main/antlr/ACIItem.g Tue Jun 13 18:15:12 2006 @@ -30,7 +30,6 @@ import javax.naming.directory.Attribute; import javax.naming.directory.BasicAttribute; -import javax.naming.Name; import javax.naming.NamingException; import org.apache.directory.shared.ldap.filter.AbstractExprNode; @@ -39,7 +38,6 @@ import org.apache.directory.shared.ldap.filter.FilterParserImpl; import org.apache.directory.shared.ldap.filter.LeafNode; import org.apache.directory.shared.ldap.filter.SimpleNode; -import org.apache.directory.shared.ldap.name.DnParser; import org.apache.directory.shared.ldap.name.NameComponentNormalizer; import org.apache.directory.shared.ldap.subtree.SubtreeSpecification; import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier; @@ -49,6 +47,8 @@ import org.apache.directory.shared.ldap.util.NamespaceTools; import org.apache.directory.shared.ldap.util.NoDuplicateKeysMap; import org.apache.directory.shared.ldap.util.OptionalComponentsMonitor; +import org.apache.directory.shared.ldap.name.LdapDN; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -98,7 +98,6 @@ private static final Logger log = LoggerFactory.getLogger( AntlrACIItemParser.class ); // subordinate parser instances - private DnParser dnParser; private final FilterParserImpl filterParser = new FilterParserImpl(); private boolean isNormalizing = false; @@ -141,26 +140,6 @@ */ public void init() { - try - { - if( isNormalizing ) - { - dnParser = new DnParser( normalizer ); - } - else - { - dnParser = new DnParser(); - } - } - catch ( NamingException e ) - { - String msg = "Failed to initialize the subordinate DnParser for this AntlrACIItemParser"; - - // We throw a NPE since this variable cannot be null for proper operation - // so we can catch the null pointer before the dnParser is even used. - - throw new NullPointerException( "dnParser is null: " + msg ); - } } /** @@ -508,7 +487,8 @@ { // A Dn can be considered as a set of attributeTypeAndValues // So, parse the set as a Dn and extract each attributeTypeAndValue - Name attributeTypeAndValueSetAsDn = dnParser.parse( token.getText() ); + LdapDN attributeTypeAndValueSetAsDn = new LdapDN( token.getText() ); + attributeTypeAndValueSetAsDn.normalize(); Enumeration attributeTypeAndValueSet = attributeTypeAndValueSetAsDn.getAll(); while ( attributeTypeAndValueSet.hasMoreElements() ) { @@ -891,7 +871,7 @@ { log.debug( "entered name()" ); Set l_name = new HashSet(); - Name l_distinguishedName = null; + LdapDN l_distinguishedName = null; } : ID_name ( SP )+ @@ -914,7 +894,7 @@ { log.debug( "entered userGroup()" ); Set l_userGroup = new HashSet(); - Name l_distinguishedName = null; + LdapDN l_distinguishedName = null; } : ID_userGroup ( SP )+ @@ -1075,7 +1055,7 @@ ss_base { log.debug( "entered ss_base()" ); - Name base = null; + LdapDN base = null; } : ID_base ( SP )+ base=distinguishedName @@ -1119,7 +1099,7 @@ chopBefore { log.debug( "entered chopBefore()" ); - Name chopBeforeExclusion = null; + LdapDN chopBeforeExclusion = null; } : ID_chopBefore ( SP )* COLON ( SP )* chopBeforeExclusion=distinguishedName @@ -1131,7 +1111,7 @@ chopAfter { log.debug( "entered chopAfter()" ); - Name chopAfterExclusion = null; + LdapDN chopAfterExclusion = null; } : ID_chopAfter ( SP )* COLON ( SP )* chopAfterExclusion=distinguishedName @@ -1164,7 +1144,7 @@ } ; -distinguishedName returns [ Name name ] +distinguishedName returns [ LdapDN name ] { log.debug( "entered distinguishedName()" ); name = null; @@ -1172,7 +1152,8 @@ : token:SAFEUTF8STRING { - name = dnParser.parse( token.getText() ); + name = new LdapDN( token.getText() ); + name.normalize(); log.debug( "recognized a DistinguishedName: " + token.getText() ); } ; Modified: directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g (original) +++ directory/trunks/shared/ldap/src/main/antlr/subtree-specification.g Tue Jun 13 18:15:12 2006 @@ -24,11 +24,7 @@ import java.util.HashSet; import java.util.ArrayList; -import javax.naming.Name; -import javax.naming.NamingException; - -import org.apache.directory.shared.ldap.name.DnParser; -import org.apache.directory.shared.ldap.name.NameComponentNormalizer; +import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.LeafNode; import org.apache.directory.shared.ldap.filter.SimpleNode; @@ -36,6 +32,7 @@ import org.apache.directory.shared.ldap.filter.AbstractExprNode; import org.apache.directory.shared.ldap.subtree.SubtreeSpecification; import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier; +import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver; import org.apache.directory.shared.ldap.util.ComponentsMonitor; import org.apache.directory.shared.ldap.util.OptionalComponentsMonitor; @@ -75,10 +72,8 @@ { private static final Logger log = LoggerFactory.getLogger( AntlrSubtreeSpecificationParser.class ); - private DnParser dnParser; - private boolean isNormalizing = false; - private NameComponentNormalizer normalizer; + private NormalizerMappingResolver resolver; private Set chopBeforeExclusions = new HashSet(); private Set chopAfterExclusions = new HashSet(); @@ -88,45 +83,25 @@ private ComponentsMonitor subtreeSpecificationComponentsMonitor = null; /** - * Creates a (normalizing) subordinate DnParser for parsing LocalNames. - * This method MUST be called for each instance while we cannot do - * constructor overloading for this class. - * - * @return the DnParser to be used for parsing LocalNames + * Does nothing. */ public void init() { - try - { - if( isNormalizing ) - { - dnParser = new DnParser( normalizer ); - } - else - { - dnParser = new DnParser(); - } - } - catch ( NamingException e ) - { - String msg = "Failed to initialize the subordinate DnParser for this AntlrSubtreeSpecificationParser"; - - // We throw a NPE since this variable cannot be null for proper operation - // so we can catch the null pointer before the dnParser is even used. - - throw new NullPointerException( "dnParser is null: " + msg ); - } } - - /** - * Sets the NameComponentNormalizer for this parser's dnParser. - */ - public void setNormalizer(NameComponentNormalizer normalizer) + + + public void setNormalizerMappingResolver( NormalizerMappingResolver resolver ) + { + this.resolver = resolver; + } + + + public boolean isNormalizing() { - this.normalizer = normalizer; - this.isNormalizing = true; + return this.resolver != null; } + private int token2Integer( Token token ) throws RecognitionException { int i = 0; @@ -218,7 +193,7 @@ ss_base { log.debug( "entered ss_base()" ); - Name base = null; + LdapDN base = null; } : ID_base ( SP )+ base=distinguishedName @@ -262,7 +237,7 @@ chopBefore { log.debug( "entered chopBefore()" ); - Name chopBeforeExclusion = null; + LdapDN chopBeforeExclusion = null; } : ID_chopBefore ( SP )* COLON ( SP )* chopBeforeExclusion=distinguishedName @@ -274,7 +249,7 @@ chopAfter { log.debug( "entered chopAfter()" ); - Name chopAfterExclusion = null; + LdapDN chopAfterExclusion = null; } : ID_chopAfter ( SP )* COLON ( SP )* chopAfterExclusion=distinguishedName @@ -315,11 +290,12 @@ : ID_specificationFilter ( SP )+ theRefinement=refinement { + // TODO need to normalize refinement filter ssModifier.setRefinement( theRefinement ); } ; -distinguishedName returns [ Name name ] +distinguishedName returns [ LdapDN name ] { log.debug( "entered distinguishedName()" ); name = null; @@ -327,7 +303,11 @@ : token:SAFEUTF8STRING { - name = dnParser.parse( token.getText() ); + name = new LdapDN( token.getText() ); + if ( isNormalizing() ) + { + name.normalize(); + } log.debug( "recognized a DistinguishedName: " + token.getText() ); } ; Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java Tue Jun 13 18:15:12 2006 @@ -98,7 +98,7 @@ */ public synchronized ACIItem parse( String spec ) throws ParseException { - ACIItem l_ACIItem = null; + ACIItem aCIItem = null; if ( spec == null || spec.trim().equals( "" ) ) { @@ -109,7 +109,7 @@ try { - l_ACIItem = this.parser.wrapperEntryPoint(); + aCIItem = this.parser.wrapperEntryPoint(); } catch ( TokenStreamException e ) { @@ -124,7 +124,7 @@ throw new ParseException( msg, e.getColumn() ); } - return l_ACIItem; + return aCIItem; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java Tue Jun 13 18:15:12 2006 @@ -17,6 +17,8 @@ package org.apache.directory.shared.ldap.codec; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.Asn1Object; import org.apache.directory.shared.asn1.codec.DecoderException; @@ -45,5 +47,5 @@ * @throws DecoderException * if anything goes wrong */ - Asn1Object decode( byte[] controlBytes ) throws DecoderException; + Asn1Object decode( byte[] controlBytes ) throws DecoderException, NamingException; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlValueAction.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlValueAction.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlValueAction.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlValueAction.java Tue Jun 13 18:15:12 2006 @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.Map; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.grammar.GrammarAction; import org.apache.directory.shared.asn1.ber.tlv.TLV; @@ -64,7 +66,7 @@ } - public void action( IAsn1Container container ) throws DecoderException + public void action( IAsn1Container container ) throws DecoderException, NamingException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage(); Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java Tue Jun 13 18:15:12 2006 @@ -124,7 +124,7 @@ */ public String getMatchedDN() { - return ( ( matchedDN == null ) ? null : matchedDN.toString() ); + return ( ( matchedDN == null ) ? "" : matchedDN.toString() ); } @@ -205,7 +205,14 @@ ldapResultLength = 1 + 1 + 1; // The matchedDN length - ldapResultLength += 1 + Length.getNbBytes( LdapDN.getNbBytes( matchedDN ) ) + LdapDN.getNbBytes( matchedDN ); + if ( matchedDN == null ) + { + ldapResultLength += 1 + 1; + } + else + { + ldapResultLength += 1 + Length.getNbBytes( LdapDN.getNbBytes( matchedDN ) ) + LdapDN.getNbBytes( matchedDN ); + } // The errorMessage length ldapResultLength += 1 + Length.getNbBytes( errorMessage.getNbBytes() ) + errorMessage.getNbBytes(); Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java Tue Jun 13 18:15:12 2006 @@ -5,6 +5,8 @@ import java.nio.ByteBuffer; import java.util.Set; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum; import org.apache.directory.shared.asn1.codec.DecoderException; @@ -80,45 +82,51 @@ while ( buf.hasRemaining() ) { - - ldapDecoder.decode( buf, ldapMessageContainer ); - - if ( log.isDebugEnabled() ) - { - log.debug( "Decoding the PDU : " ); - - int size = buf.position(); - buf.flip(); - - byte[] array = new byte[ size - position ]; - - for ( int i = position; i < size; i++ ) - { - array[ i ] = buf.get(); - } - - position = size; - - log.debug( StringTools.dumpBytes( array ) ); - } - - if ( ldapMessageContainer.getState() == TLVStateEnum.PDU_DECODED ) + try { + ldapDecoder.decode( buf, ldapMessageContainer ); + if ( log.isDebugEnabled() ) { - log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getLdapMessage() ); - buf.mark(); + log.debug( "Decoding the PDU : " ); + + int size = buf.position(); + buf.flip(); + + byte[] array = new byte[ size - position ]; + + for ( int i = position; i < size; i++ ) + { + array[ i ] = buf.get(); + } + + position = size; + + log.debug( StringTools.dumpBytes( array ) ); + } + + if ( ldapMessageContainer.getState() == TLVStateEnum.PDU_DECODED ) + { + if ( log.isDebugEnabled() ) + { + log.debug( "Decoded LdapMessage : " + ldapMessageContainer.getLdapMessage() ); + buf.mark(); + } + + decoderCallback.decodeOccurred( null, ldapMessageContainer.getLdapMessage() ); + ldapMessageContainer.clean(); + } + else + { + if ( log.isDebugEnabled() ) + { + + } } - - decoderCallback.decodeOccurred( null, ldapMessageContainer.getLdapMessage() ); - ldapMessageContainer.clean(); } - else + catch ( NamingException lne ) { - if ( log.isDebugEnabled() ) - { - - } + } } } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java Tue Jun 13 18:15:12 2006 @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.Iterator; -import javax.naming.InvalidNameException; import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; import javax.naming.directory.BasicAttribute; @@ -107,7 +106,6 @@ import org.apache.directory.shared.ldap.message.extended.GracefulShutdownRequest; import org.apache.directory.shared.ldap.message.spi.Provider; import org.apache.directory.shared.ldap.message.spi.TransformerSpi; -import org.apache.directory.shared.ldap.name.LdapDN; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -213,7 +211,7 @@ // Twix : int version -> Snickers : boolean isVersion3 snickersMessage.setVersion3( bindRequest.isLdapV3() ); - // Twix : LdapDN name -> Snickers : String name + // Twix : LdapDN name -> Snickers : LdapDN name snickersMessage.setName( bindRequest.getName() ); // Twix : Asn1Object authentication instanceOf SimpleAuthentication -> @@ -253,7 +251,7 @@ CompareRequestImpl snickersMessage = new CompareRequestImpl( messageId ); CompareRequest compareRequest = twixMessage.getCompareRequest(); - // Twix : LdapDN entry -> Snickers : private String name + // Twix : LdapDN entry -> Snickers : private LdapDN snickersMessage.setName( compareRequest.getEntry() ); // Twix : LdapString attributeDesc -> Snickers : String attrId @@ -287,7 +285,7 @@ DeleteRequestImpl snickersMessage = new DeleteRequestImpl( messageId ); DelRequest delRequest = twixMessage.getDelRequest(); - // Twix : LdapDN entry -> Snickers : String name + // Twix : LdapDN entry -> Snickers : LdapDN snickersMessage.setName( delRequest.getEntry() ); return snickersMessage; @@ -343,16 +341,16 @@ ModifyDnRequestImpl snickersMessage = new ModifyDnRequestImpl( messageId ); ModifyDNRequest modifyDNRequest = twixMessage.getModifyDNRequest(); - // Twix : LdapDN entry -> Snickers : String m_name + // Twix : LdapDN entry -> Snickers : LdapDN m_name snickersMessage.setName( modifyDNRequest.getEntry() ); - // Twix : RelativeLdapDN newRDN -> Snickers : String m_newRdn + // Twix : RelativeLdapDN newRDN -> Snickers : LdapDN m_newRdn snickersMessage.setNewRdn( modifyDNRequest.getNewRDN() ); // Twix : boolean deleteOldRDN -> Snickers : boolean m_deleteOldRdn snickersMessage.setDeleteOldRdn( modifyDNRequest.isDeleteOldRDN() ); - // Twix : LdapDN newSuperior -> Snickers : String m_newSuperior + // Twix : LdapDN newSuperior -> Snickers : LdapDN m_newSuperior snickersMessage.setNewSuperior( modifyDNRequest.getNewSuperior() ); return snickersMessage; @@ -823,24 +821,7 @@ } // Snickers : String matchedDn -> Twix : LdapDN matchedDN - try - { - String matchedDn = snickersLdapResult.getMatchedDn(); - - if ( ( matchedDn == null ) || ( matchedDn.length() == 0 ) ) - { - twixLdapResult.setMatchedDN( LdapDN.EMPTY_LDAPDN ); - } - else - { - twixLdapResult.setMatchedDN( new LdapDN( snickersLdapResult.getMatchedDn() ) ); - } - } - catch ( InvalidNameException ine ) - { - log.warn( "The DN " + snickersLdapResult.getMatchedDn() + " is invalid : " + ine.getMessage() ); - twixLdapResult.setMatchedDN( LdapDN.EMPTY_LDAPDN ); - } + twixLdapResult.setMatchedDN( snickersLdapResult.getMatchedDn() ); // Snickers : Referral referral -> Twix : ArrayList referrals ReferralImpl snisckersReferrals = ( ReferralImpl ) snickersLdapResult.getReferral(); @@ -1084,16 +1065,8 @@ SearchResponseEntryImpl snickersSearchResultResponse = ( SearchResponseEntryImpl ) snickersMessage; SearchResultEntry searchResultEntry = new SearchResultEntry(); - // Snickers : String dn -> Twix : LdapDN objectName - try - { - searchResultEntry.setObjectName( new LdapDN( snickersSearchResultResponse.getObjectName().getBytes() ) ); - } - catch ( InvalidNameException ine ) - { - log.warn( "The DN " + snickersSearchResultResponse.getObjectName() + " is invalid : " + ine.getMessage() ); - searchResultEntry.setObjectName( LdapDN.EMPTY_LDAPDN ); - } + // Snickers : LdapDN dn -> Twix : LdapDN objectName + searchResultEntry.setObjectName( snickersSearchResultResponse.getObjectName() ); // Snickers : Attributes attributes -> Twix : ArrayList // partialAttributeList Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java Tue Jun 13 18:15:12 2006 @@ -36,7 +36,6 @@ import java.util.LinkedList; import java.util.List; -import javax.naming.Name; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -65,7 +64,7 @@ // ---------------------------------------------------------------------------- /** The DN to be added. */ - private Name entry; + private LdapDN entry; /** The attributes list. */ private Attributes attributes; @@ -174,9 +173,9 @@ * * @return Returns the entry. */ - public String getEntry() + public LdapDN getEntry() { - return ( ( entry == null ) ? "" : entry.toString() ); + return entry; } @@ -186,7 +185,7 @@ * @param entry * The entry to set. */ - public void setEntry( Name entry ) + public void setEntry( LdapDN entry ) { this.entry = entry; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestGrammar.java Tue Jun 13 18:15:12 2006 @@ -18,7 +18,6 @@ import javax.naming.InvalidNameException; -import javax.naming.Name; import javax.naming.NamingException; import org.apache.directory.shared.asn1.ber.IAsn1Container; @@ -35,6 +34,9 @@ import org.apache.directory.shared.ldap.codec.LdapStatesEnum; import org.apache.directory.shared.ldap.codec.util.LdapString; import org.apache.directory.shared.ldap.codec.util.LdapStringEncodingException; +import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException; +import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; @@ -90,7 +92,7 @@ LdapStatesEnum.ADD_REQUEST_VALUE, LdapStatesEnum.ADD_REQUEST_ENTRY_TAG, new GrammarAction( "Init addRequest" ) { - public void action( IAsn1Container container ) throws DecoderException + public void action( IAsn1Container container ) throws DecoderException, NamingException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; @@ -143,12 +145,11 @@ } else { - Name entry = null; + LdapDN entry = null; try { entry = new LdapDN( tlv.getValue().getData() ); - entry = LdapDN.normalize( entry ); } catch ( InvalidNameException ine ) { @@ -157,13 +158,6 @@ log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } - catch ( NamingException ne ) - { - String msg = "The DN is invalid : " + StringTools.dumpBytes( tlv.getValue().getData() ) - + " : " + ne.getMessage(); - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); - } addRequest.setEntry( entry ); } @@ -234,7 +228,7 @@ LdapStatesEnum.ADD_REQUEST_ATTRIBUTE_TYPE_VALUE, LdapStatesEnum.ADD_REQUEST_ATTRIBUTE_VALS_TAG, new GrammarAction( "Store attribute type" ) { - public void action( IAsn1Container container ) throws DecoderException + public void action( IAsn1Container container ) throws DecoderException, NamingException { LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container; @@ -255,7 +249,7 @@ { try { - type = LdapDN.normalizeAttribute( tlv.getValue().getData() ); + type = new LdapString( tlv.getValue().getData() ); addRequest.addAttributeType( type ); } @@ -263,7 +257,7 @@ { log.error( "The type is invalid : {} : {}", StringTools .dumpBytes( tlv.getValue().getData() ), lsee.getMessage() ); - throw new DecoderException( "Invalid attribute type : " + lsee.getMessage() ); + throw new LdapInvalidAttributeIdentifierException( "Invalid attribute type : " + lsee.getMessage() ); } } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java Tue Jun 13 18:15:12 2006 @@ -20,8 +20,6 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import javax.naming.Name; - import org.apache.directory.shared.asn1.ber.tlv.Length; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.asn1.codec.EncoderException; @@ -46,7 +44,7 @@ private int version; /** The name of the user requesting a bind */ - private Name name; + private LdapDN name; /** The authentication used to bind the user */ private LdapAuthentication authentication; @@ -131,9 +129,9 @@ * * @return The user name */ - public String getName() + public LdapDN getName() { - return ( ( name == null ) ? null : name.toString() ); + return name; } @@ -143,7 +141,7 @@ * @param name * The user name */ - public void setName( Name name ) + public void setName( LdapDN name ) { this.name = name; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestGrammar.java Tue Jun 13 18:15:12 2006 @@ -18,8 +18,6 @@ import javax.naming.InvalidNameException; -import javax.naming.Name; -import javax.naming.NamingException; import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar; @@ -213,12 +211,11 @@ } else { - Name name = LdapDN.EMPTY_LDAPDN; + LdapDN name = LdapDN.EMPTY_LDAPDN; try { name = new LdapDN( tlv.getValue().getData() ); - name = LdapDN.normalize( name ); } catch ( InvalidNameException ine ) { @@ -226,13 +223,6 @@ + " : " + ine.getMessage(); log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); - } - catch ( NamingException ne ) - { - String msg = "Incorrect DN given : " + StringTools.dumpBytes( tlv.getValue().getData() ) - + " : " + ne.getMessage(); - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); } bindRequestMessage.setName( name ); Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequest.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequest.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequest.java Tue Jun 13 18:15:12 2006 @@ -20,8 +20,6 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import javax.naming.Name; - import org.apache.directory.shared.asn1.ber.tlv.Length; import org.apache.directory.shared.asn1.ber.tlv.UniversalTag; import org.apache.directory.shared.asn1.ber.tlv.Value; @@ -48,7 +46,7 @@ // ---------------------------------------------------------------------------- /** The entry to be compared */ - private Name entry; + private LdapDN entry; /** The attribute to be compared */ private LdapString attributeDesc; @@ -94,9 +92,9 @@ * * @return Returns the entry. */ - public String getEntry() + public LdapDN getEntry() { - return ( ( entry == null ) ? "" : entry.toString() ); + return entry; } @@ -106,7 +104,7 @@ * @param entry * The entry to set. */ - public void setEntry( Name entry ) + public void setEntry( LdapDN entry ) { this.entry = entry; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestGrammar.java Tue Jun 13 18:15:12 2006 @@ -18,8 +18,6 @@ import javax.naming.InvalidNameException; -import javax.naming.Name; -import javax.naming.NamingException; import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar; @@ -126,7 +124,7 @@ // Get the Value and store it in the CompareRequest TLV tlv = ldapMessageContainer.getCurrentTLV(); - Name entry = null; + LdapDN entry = null; // We have to handle the special case of a 0 length matched // DN @@ -139,7 +137,6 @@ try { entry = new LdapDN( tlv.getValue().getData() ); - entry = LdapDN.normalize( entry ); } catch ( InvalidNameException ine ) { @@ -148,13 +145,6 @@ log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } - catch ( NamingException ne ) - { - String msg = "The DN to compare (" + StringTools.dumpBytes( tlv.getValue().getData() ) - + ") is invalid"; - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); - } compareRequest.setEntry( entry ); } @@ -220,7 +210,7 @@ { try { - LdapString type = LdapDN.normalizeAttribute( tlv.getValue().getData() ); + LdapString type = new LdapString( tlv.getValue().getData() ); compareRequest.setAttributeDesc( type ); } catch ( LdapStringEncodingException lsee ) Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequest.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequest.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequest.java Tue Jun 13 18:15:12 2006 @@ -20,8 +20,6 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import javax.naming.Name; - import org.apache.directory.shared.asn1.ber.tlv.Length; import org.apache.directory.shared.asn1.codec.EncoderException; import org.apache.directory.shared.ldap.codec.LdapConstants; @@ -40,7 +38,7 @@ // ---------------------------------------------------------------------------- /** The entry to be deleted */ - private Name entry; + private LdapDN entry; // ~ Constructors @@ -74,9 +72,9 @@ * * @return Returns the entry. */ - public String getEntry() + public LdapDN getEntry() { - return ( ( entry == null ) ? "" : entry.toString() ); + return entry; } @@ -86,7 +84,7 @@ * @param entry * The entry to set. */ - public void setEntry( Name entry ) + public void setEntry( LdapDN entry ) { this.entry = entry; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestGrammar.java Tue Jun 13 18:15:12 2006 @@ -18,8 +18,6 @@ import javax.naming.InvalidNameException; -import javax.naming.Name; -import javax.naming.NamingException; import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar; @@ -100,7 +98,7 @@ // We have to handle the special case of a 0 length matched // DN - Name entry = null; + LdapDN entry = null; if ( tlv.getLength().getLength() == 0 ) { @@ -111,7 +109,6 @@ try { entry = new LdapDN( tlv.getValue().getData() ); - entry = LdapDN.normalize( entry ); } catch ( InvalidNameException ine ) { @@ -120,14 +117,6 @@ log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } - catch ( NamingException ne ) - { - String msg = "The DN to delete (" + StringTools.dumpBytes( tlv.getValue().getData() ) - + ") is invalid"; - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); - } - delRequest.setEntry( entry ); } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java Tue Jun 13 18:15:12 2006 @@ -19,6 +19,8 @@ import java.nio.ByteBuffer; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.Asn1Object; import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.codec.DecoderException; @@ -45,7 +47,7 @@ * @throws DecoderException * If the decoding failed */ - public Asn1Object decode( byte[] stream ) throws DecoderException + public Asn1Object decode( byte[] stream ) throws DecoderException, NamingException { ByteBuffer bb = ByteBuffer.wrap( stream ); GracefulDisconnectContainer container = new GracefulDisconnectContainer(); Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownDecoder.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownDecoder.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownDecoder.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownDecoder.java Tue Jun 13 18:15:12 2006 @@ -19,6 +19,8 @@ import java.nio.ByteBuffer; +import javax.naming.NamingException; + import org.apache.directory.shared.asn1.Asn1Object; import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.codec.DecoderException; @@ -45,7 +47,7 @@ * @throws DecoderException * If the decoding failed */ - public Asn1Object decode( byte[] stream ) throws DecoderException + public Asn1Object decode( byte[] stream ) throws DecoderException, NamingException { ByteBuffer bb = ByteBuffer.wrap( stream ); GracefulShutdownContainer container = new GracefulShutdownContainer(); Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java Tue Jun 13 18:15:12 2006 @@ -36,7 +36,6 @@ import java.util.LinkedList; import java.util.List; -import javax.naming.Name; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -67,7 +66,7 @@ // ---------------------------------------------------------------------------- /** The DN to be modified. */ - private Name object; + private LdapDN object; /** The modifications list. This is an array of ModificationItem. */ private ArrayList modifications; @@ -227,9 +226,9 @@ * * @return Returns the object. */ - public String getObject() + public LdapDN getObject() { - return ( ( object == null ) ? "" : object.toString() ); + return object; } @@ -239,7 +238,7 @@ * @param object * The DN to set. */ - public void setObject( Name object ) + public void setObject( LdapDN object ) { this.object = object; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestGrammar.java Tue Jun 13 18:15:12 2006 @@ -18,8 +18,6 @@ import javax.naming.InvalidNameException; -import javax.naming.Name; -import javax.naming.NamingException; import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar; @@ -130,7 +128,7 @@ TLV tlv = ldapMessageContainer.getCurrentTLV(); - Name object = LdapDN.EMPTY_LDAPDN; + LdapDN object = LdapDN.EMPTY_LDAPDN; // Store the value. if ( tlv.getLength().getLength() == 0 ) @@ -143,7 +141,6 @@ try { object = new LdapDN( tlv.getValue().getData() ); - object = LdapDN.normalize( object ); } catch ( InvalidNameException ine ) { @@ -152,13 +149,6 @@ log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } - catch ( NamingException ne ) - { - String msg = "Invalid DN " + StringTools.dumpBytes( tlv.getValue().getData() ) + ", : " - + ne.getMessage(); - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); - } modifyRequest.setObject( object ); } @@ -350,7 +340,7 @@ { try { - type = LdapDN.normalizeAttribute( tlv.getValue().getData() ); + type = new LdapString( tlv.getValue().getData() ); modifyRequest.addAttributeTypeAndValues( type ); } catch ( LdapStringEncodingException lsee ) Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java Tue Jun 13 18:15:12 2006 @@ -20,8 +20,6 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import javax.naming.Name; - import org.apache.directory.shared.asn1.ber.tlv.Length; import org.apache.directory.shared.asn1.ber.tlv.Value; import org.apache.directory.shared.asn1.codec.EncoderException; @@ -45,7 +43,7 @@ // ---------------------------------------------------------------------------- /** The DN to be modified. */ - private Name entry; + private LdapDN entry; /** The new RDN to be added to the RDN or to the new superior, if present */ private Rdn newRDN; @@ -54,7 +52,7 @@ private boolean deleteOldRDN; /** The optional superior, which will be concatened to the newRdn */ - private Name newSuperior; + private LdapDN newSuperior; /** The modify DN request length */ private transient int modifyDNRequestLength; @@ -91,9 +89,9 @@ * * @return Returns the entry. */ - public String getEntry() + public LdapDN getEntry() { - return ( ( entry == null ) ? "" : entry.toString() ); + return entry; } @@ -103,7 +101,7 @@ * @param entry * The entry to set. */ - public void setEntry( Name entry ) + public void setEntry( LdapDN entry ) { this.entry = entry; } @@ -137,9 +135,9 @@ * * @return Returns the newRDN. */ - public String getNewRDN() + public Rdn getNewRDN() { - return ( ( newRDN == null ) ? "" : newRDN.toString() ); + return newRDN; } @@ -160,9 +158,9 @@ * * @return Returns the newSuperior. */ - public String getNewSuperior() + public LdapDN getNewSuperior() { - return ( ( newSuperior == null ) ? "" : newSuperior.toString() ); + return newSuperior; } @@ -172,7 +170,7 @@ * @param newSuperior * The newSuperior to set. */ - public void setNewSuperior( Name newSuperior ) + public void setNewSuperior( LdapDN newSuperior ) { this.newSuperior = newSuperior; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestGrammar.java Tue Jun 13 18:15:12 2006 @@ -18,8 +18,6 @@ import javax.naming.InvalidNameException; -import javax.naming.Name; -import javax.naming.NamingException; import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar; @@ -132,7 +130,7 @@ // We have to handle the special case of a 0 length matched // DN - Name entry = null; + LdapDN entry = null; if ( tlv.getLength().getLength() == 0 ) { @@ -143,7 +141,6 @@ try { entry = new LdapDN( tlv.getValue().getData() ); - entry = LdapDN.normalize( entry ); } catch ( InvalidNameException ine ) { @@ -152,13 +149,6 @@ log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } - catch ( NamingException ne ) - { - String msg = "The DN to modify (" + StringTools.dumpBytes( tlv.getValue().getData() ) - + ") is invalid"; - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); - } modifyDNRequest.setEntry( entry ); } @@ -215,8 +205,7 @@ { try { - Name dn = new LdapDN( tlv.getValue().getData() ); - dn = LdapDN.normalize( dn ); + LdapDN dn = new LdapDN( tlv.getValue().getData() ); newRdn = ( ( LdapDN ) dn ).getRdn( 0 ); } catch ( InvalidNameException ine ) @@ -226,13 +215,6 @@ log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); } - catch ( NamingException ne ) - { - String msg = "The new RDN (" + StringTools.dumpBytes( tlv.getValue().getData() ) - + ") is invalid"; - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); - } modifyDNRequest.setNewRDN( newRdn ); } @@ -345,7 +327,7 @@ // We have to handle the special case of a 0 length matched // DN - Name newSuperior = LdapDN.EMPTY_LDAPDN; + LdapDN newSuperior = LdapDN.EMPTY_LDAPDN; if ( tlv.getLength().getLength() == 0 ) { @@ -367,7 +349,6 @@ try { newSuperior = new LdapDN( tlv.getValue().getData() ); - newSuperior = LdapDN.normalize( newSuperior ); } catch ( InvalidNameException ine ) { @@ -375,13 +356,6 @@ + ") is invalid"; log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); - } - catch ( NamingException ne ) - { - String msg = "The new superior DN (" + StringTools.dumpBytes( tlv.getValue().getData() ) - + ") is invalid"; - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); } modifyDNRequest.setNewSuperior( newSuperior ); Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/FilterGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/FilterGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/FilterGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/FilterGrammar.java Tue Jun 13 18:15:12 2006 @@ -32,7 +32,6 @@ import org.apache.directory.shared.ldap.codec.LdapStatesEnum; import org.apache.directory.shared.ldap.codec.util.LdapString; import org.apache.directory.shared.ldap.codec.util.LdapStringEncodingException; -import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -473,7 +472,7 @@ try { - LdapString type = LdapDN.normalizeAttribute( tlv.getValue().getData() ); + LdapString type = new LdapString( tlv.getValue().getData() ); assertion.setAttributeDesc( type ); } catch ( LdapStringEncodingException lsee ) @@ -572,7 +571,7 @@ { try { - LdapString type = LdapDN.normalizeAttribute( tlv.getValue().getData() ); + LdapString type = new LdapString( tlv.getValue().getData() ); assertion.setAttributeDesc( type ); } catch ( LdapStringEncodingException lsee ) @@ -644,7 +643,7 @@ // Store the value. try { - LdapString type = LdapDN.normalizeAttribute( tlv.getValue().getData() ); + LdapString type = new LdapString( tlv.getValue().getData() ); presentFilter.setAttributeDescription( type ); } catch ( LdapStringEncodingException lsee ) Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/MatchingRuleAssertionGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/MatchingRuleAssertionGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/MatchingRuleAssertionGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/MatchingRuleAssertionGrammar.java Tue Jun 13 18:15:12 2006 @@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.codec.LdapStatesEnum; import org.apache.directory.shared.ldap.codec.util.LdapString; import org.apache.directory.shared.ldap.codec.util.LdapStringEncodingException; -import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -224,7 +223,7 @@ try { - LdapString type = LdapDN.normalizeAttribute( tlv.getValue().getData() ); + LdapString type = new LdapString( tlv.getValue().getData() ); extensibleMatchFilter.setType( type ); } catch ( LdapStringEncodingException lsee ) Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java Tue Jun 13 18:15:12 2006 @@ -31,7 +31,6 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import javax.naming.Name; import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; @@ -51,7 +50,7 @@ // ---------------------------------------------------------------------------- /** The base DN */ - private Name baseObject; + private LdapDN baseObject; /** The scope. It could be baseObject, singleLevel or wholeSubtree. */ private int scope; @@ -152,9 +151,9 @@ * * @return Returns the baseObject. */ - public String getBaseObject() + public LdapDN getBaseObject() { - return ( ( baseObject == null ) ? null : baseObject.toString() ); + return baseObject; } @@ -164,7 +163,7 @@ * @param baseObject * The baseObject to set. */ - public void setBaseObject( Name baseObject ) + public void setBaseObject( LdapDN baseObject ) { this.baseObject = baseObject; } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestGrammar.java Tue Jun 13 18:15:12 2006 @@ -18,8 +18,6 @@ import javax.naming.InvalidNameException; -import javax.naming.Name; -import javax.naming.NamingException; import org.apache.directory.shared.asn1.ber.IAsn1Container; import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar; @@ -134,7 +132,7 @@ TLV tlv = ldapMessageContainer.getCurrentTLV(); // We have to check that this is a correct DN - Name baseObject = LdapDN.EMPTY_LDAPDN; + LdapDN baseObject = LdapDN.EMPTY_LDAPDN; // We have to handle the special case of a 0 length base // object, @@ -145,19 +143,12 @@ try { baseObject = new LdapDN( tlv.getValue().getData() ); - baseObject = LdapDN.normalize( baseObject ); } catch ( InvalidNameException ine ) { String msg = "The root DN " + baseObject.toString() + " is invalid"; log.error( "{} : {}", msg, ine.getMessage() ); throw new DecoderException( msg, ine ); - } - catch ( NamingException ne ) - { - String msg = "The root DN " + baseObject.toString() + " cannot be modified"; - log.error( "{} : {}", msg, ne.getMessage() ); - throw new DecoderException( msg, ne ); } } Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java?rev=414015&r1=414014&r2=414015&view=diff ============================================================================== --- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java (original) +++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java Tue Jun 13 18:15:12 2006 @@ -33,7 +33,6 @@ import java.util.LinkedList; import java.util.List; -import javax.naming.Name; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -59,7 +58,7 @@ // ---------------------------------------------------------------------------- /** The DN of the returned entry */ - private Name objectName; + private LdapDN objectName; /** The attributes list. It contains javax.naming.directory.Attribute */ private Attributes partialAttributeList; @@ -112,9 +111,9 @@ * * @return Returns the objectName. */ - public String getObjectName() + public LdapDN getObjectName() { - return ( ( objectName == null ) ? null : objectName.toString() ); + return objectName; } @@ -124,7 +123,7 @@ * @param objectName * The objectName to set. */ - public void setObjectName( Name objectName ) + public void setObjectName( LdapDN objectName ) { this.objectName = objectName; }