Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 80298 invoked from network); 24 Jan 2011 00:38:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jan 2011 00:38:37 -0000 Received: (qmail 53716 invoked by uid 500); 24 Jan 2011 00:38:37 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 53675 invoked by uid 500); 24 Jan 2011 00:38:37 -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 53668 invoked by uid 99); 24 Jan 2011 00:38:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jan 2011 00:38:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jan 2011 00:38:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C4F782388A84; Mon, 24 Jan 2011 00:38:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062587 [4/5] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ apacheds/trunk/core-api/src/main/java/org/apache/direc... Date: Mon, 24 Jan 2011 00:38:01 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110124003805.C4F782388A84@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Mon Jan 24 00:37:51 2011 @@ -34,6 +34,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapProtocolErrorException; +import org.apache.directory.shared.ldap.model.filter.*; import org.apache.directory.shared.ldap.model.message.*; import org.apache.directory.shared.ldap.codec.search.AndFilter; import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter; @@ -45,23 +46,22 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.search.PresentFilter; import org.apache.directory.shared.ldap.codec.search.SubstringFilter; import org.apache.directory.shared.ldap.model.entry.Value; -import org.apache.directory.shared.ldap.filter.AndNode; -import org.apache.directory.shared.ldap.filter.ApproximateNode; -import org.apache.directory.shared.ldap.filter.BranchNode; -import org.apache.directory.shared.ldap.filter.BranchNormalizedVisitor; -import org.apache.directory.shared.ldap.filter.EqualityNode; -import org.apache.directory.shared.ldap.filter.ExprNode; -import org.apache.directory.shared.ldap.filter.ExtensibleNode; -import org.apache.directory.shared.ldap.filter.FilterParser; -import org.apache.directory.shared.ldap.filter.GreaterEqNode; -import org.apache.directory.shared.ldap.filter.LeafNode; -import org.apache.directory.shared.ldap.filter.LessEqNode; -import org.apache.directory.shared.ldap.filter.NotNode; -import org.apache.directory.shared.ldap.filter.OrNode; -import org.apache.directory.shared.ldap.filter.PresenceNode; -import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.filter.SimpleNode; -import org.apache.directory.shared.ldap.filter.SubstringNode; +import org.apache.directory.shared.ldap.model.filter.AndNode; +import org.apache.directory.shared.ldap.model.filter.ApproximateNode; +import org.apache.directory.shared.ldap.model.filter.BranchNode; +import org.apache.directory.shared.ldap.model.filter.BranchNormalizedVisitor; +import org.apache.directory.shared.ldap.model.filter.EqualityNode; +import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.ExtensibleNode; +import org.apache.directory.shared.ldap.model.filter.FilterParser; +import org.apache.directory.shared.ldap.model.filter.GreaterEqNode; +import org.apache.directory.shared.ldap.model.filter.LessEqNode; +import org.apache.directory.shared.ldap.model.filter.NotNode; +import org.apache.directory.shared.ldap.model.filter.OrNode; +import org.apache.directory.shared.ldap.model.filter.PresenceNode; +import org.apache.directory.shared.ldap.model.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.SimpleNode; +import org.apache.directory.shared.ldap.model.filter.SubstringNode; import org.apache.directory.shared.ldap.name.Dn; @@ -309,7 +309,7 @@ public class SearchRequestImpl extends A filter = new NotFilter(); } - List children = ( ( BranchNode ) exprNode ).getChildren(); + List children = ( (BranchNode) exprNode ).getChildren(); // Loop on all AND/OR children if ( children != null ) @@ -365,7 +365,7 @@ public class SearchRequestImpl extends A { filter = new AttributeValueAssertionFilter( LdapConstants.APPROX_MATCH_FILTER ); AttributeValueAssertion assertion = new AttributeValueAssertion(); - assertion.setAttributeDesc( ( ( ApproximateNode ) exprNode ).getAttribute() ); + assertion.setAttributeDesc( ( (ApproximateNode) exprNode ).getAttribute() ); assertion.setAssertionValue( ( ( ApproximateNode ) exprNode ).getValue() ); ( ( AttributeValueAssertionFilter ) filter ).setAssertion( assertion ); } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java Mon Jan 24 00:37:51 2011 @@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.message.Referral; import org.apache.directory.shared.ldap.message.ReferralImpl; import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.filter.LdapURL; +import org.apache.directory.shared.ldap.model.filter.LdapURL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.util.HashMap; @@ -277,7 +277,7 @@ public abstract class AbstractExprNode i /** - * @see org.apache.directory.shared.ldap.filter.ExprNode#get(java.lang.Object) + * @see ExprNode#get(java.lang.Object) * * @return the annotation value. */ @@ -293,7 +293,7 @@ public abstract class AbstractExprNode i /** - * @see org.apache.directory.shared.ldap.filter.ExprNode#set(java.lang.Object, + * @see ExprNode#set(java.lang.Object, * java.lang.Object) */ public void set( String key, Object value ) Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AbstractExprNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java Mon Jan 24 00:37:51 2011 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.util.List; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AndNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.schema.AttributeType; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ApproximateNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/Assertion.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/Assertion.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/Assertion.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/Assertion.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/Assertion.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/Assertion.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/Assertion.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import javax.naming.NamingException; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/Assertion.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.i18n.I18n; @@ -110,7 +110,7 @@ public abstract class AssertionNode exte /** * Always returns true since an AssertionNode has no children. * - * @see org.apache.directory.shared.ldap.filter.ExprNode#isLeaf() + * @see ExprNode#isLeaf() * @return true if the node is a leaf,false otherwise */ public boolean isLeaf() @@ -192,8 +192,8 @@ public abstract class AssertionNode exte /** - * @see org.apache.directory.shared.ldap.filter.ExprNode#accept( - * org.apache.directory.shared.ldap.filter.FilterVisitor) + * @see ExprNode#accept( + *FilterVisitor) */ public Object accept( FilterVisitor visitor ) { Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; /** * All the different kind of assertions. @@ -63,5 +63,5 @@ public enum AssertionType NOT, /** Undefined operation */ - UNDEFINED + UNDEFINED; } Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/AssertionType.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.util.ArrayList; @@ -94,7 +94,7 @@ public class BranchNode extends Abstract /** - * @see org.apache.directory.shared.ldap.filter.ExprNode#isLeaf() + * @see ExprNode#isLeaf() * @return false all the time. */ public final boolean isLeaf() @@ -169,17 +169,9 @@ public class BranchNode extends Abstract */ public void setChildren( List list ) { - if ( list == null ) - { - children.clear(); - } - else - { - children = list; - } + children = list; } - /** * Convenience method that gets the first child in the children array. Its * very useful for NOT nodes since they only have one child by avoiding code @@ -199,8 +191,8 @@ public class BranchNode extends Abstract /** - * @see org.apache.directory.shared.ldap.filter.ExprNode#accept( - * org.apache.directory.shared.ldap.filter.FilterVisitor) + * @see ExprNode#accept( + *FilterVisitor) * * @return The modified element */ Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.text.ParseException; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitor.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.model.entry.Value; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/EqualityNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExprNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExprNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExprNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExprNode.java Mon Jan 24 00:37:51 2011 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; /** Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExprNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.model.entry.Value; @@ -185,7 +185,7 @@ public class ExtensibleNode extends Leaf { if ( !value.isBinary() ) { - return AbstractExprNode.escapeFilterValue( value ); + return escapeFilterValue( value ); } return value; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ExtensibleNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.text.ParseException; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitor.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParserMonitor.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitor.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitor.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParserMonitor.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParserMonitor.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitor.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; /** Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitor.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitorAdapter.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParserMonitorAdapter.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitorAdapter.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitorAdapter.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParserMonitorAdapter.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParserMonitorAdapter.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitorAdapter.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; /** Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParserMonitorAdapter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterVisitor.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterVisitor.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterVisitor.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterVisitor.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterVisitor.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterVisitor.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterVisitor.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.util.List; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterVisitor.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.model.entry.Value; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LdapURL.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LdapURL.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LdapURL.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.io.ByteArrayOutputStream; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -133,8 +133,8 @@ public class LeafNode extends AbstractEx /** - * @see org.apache.directory.shared.ldap.filter.ExprNode#accept( - * org.apache.directory.shared.ldap.filter.FilterVisitor) + * @see ExprNode#accept( + *FilterVisitor) * * @param visitor the filter expression tree structure visitor * @return The modified element Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.model.entry.Value; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java Mon Jan 24 00:37:51 2011 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.util.List; @@ -113,20 +113,12 @@ public class NotNode extends BranchNode */ public void setChildren( List childList ) { - if ( childList == null ) + if ( ( childList != null ) && ( childList.size() > 1 ) ) { - children.clear(); - } - else - { - - if ( childList.size() > 1 ) - { - throw new IllegalStateException( I18n.err( I18n.ERR_04159 ) ); - } - - children = childList; + throw new IllegalStateException( I18n.err( I18n.ERR_04159 ) ); } + + children = childList; } Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java Mon Jan 24 00:37:51 2011 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.util.List; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.schema.AttributeType; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; @@ -104,8 +104,8 @@ public class ScopeNode extends AbstractE /** - * @see org.apache.directory.shared.ldap.filter.ExprNode#accept( - * org.apache.directory.shared.ldap.filter.FilterVisitor) + * @see ExprNode#accept( + *FilterVisitor) * * @param visitor the filter expression tree structure visitor * @return The modified element Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SearchScope.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SearchScope.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SearchScope.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SearchScope.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.i18n.I18n; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SearchScope.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.shared.i18n.I18n; Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java (from r1062580, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import java.util.ArrayList; @@ -449,7 +449,7 @@ public class SubstringNode extends LeafN if ( null != initialPattern ) { - buf.append( AbstractExprNode.escapeFilterValue( new StringValue( initialPattern ) ) ).append( '*' ); + buf.append( escapeFilterValue( new StringValue( initialPattern ) ) ).append( '*' ); } else { @@ -460,14 +460,14 @@ public class SubstringNode extends LeafN { for ( String any:anyPattern ) { - buf.append( AbstractExprNode.escapeFilterValue( new StringValue( any ) ) ); + buf.append( escapeFilterValue( new StringValue( any ) ) ); buf.append( '*' ); } } if ( null != finalPattern ) { - buf.append( AbstractExprNode.escapeFilterValue( new StringValue( finalPattern ) ) ); + buf.append( escapeFilterValue( new StringValue( finalPattern ) ) ); } buf.append( super.toString() ); Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/UndefinedNode.java (from r1062578, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/UndefinedNode.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/UndefinedNode.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/filter/UndefinedNode.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; /** Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchParams.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchParams.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchParams.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchParams.java Mon Jan 24 00:37:51 2011 @@ -26,7 +26,7 @@ import java.util.Set; import javax.naming.directory.SearchControls; import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java Mon Jan 24 00:37:51 2011 @@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap import java.util.List; import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.filter.ExprNode; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java Mon Jan 24 00:37:51 2011 @@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap import java.util.Collections; import java.util.Set; -import org.apache.directory.shared.ldap.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java Mon Jan 24 00:37:51 2011 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import java.util.Set; -import org.apache.directory.shared.ldap.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java Mon Jan 24 00:37:51 2011 @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.Set; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java Mon Jan 24 00:37:51 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap.trigger; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java Mon Jan 24 00:37:51 2011 @@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.aci.protectedItem.ClassesItem; -import org.apache.directory.shared.ldap.filter.ExprNode; -import org.apache.directory.shared.ldap.filter.FilterParser; +import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,7 +55,7 @@ public class ProtectedItem_ClassesTest public void initNames() throws Exception { ExprNode filterA = FilterParser.parse( "(&(cn=test)(sn=test))" ); - ExprNode filterB = FilterParser.parse( "(&(cn=test)(sn=test))" ); + ExprNode filterB = FilterParser.parse("(&(cn=test)(sn=test))"); ExprNode filterC = FilterParser.parse( "(&(cn=sample)(sn=sample))" ); classesA = new ClassesItem( filterA ); classesACopy = new ClassesItem( filterA ); Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java Mon Jan 24 00:37:51 2011 @@ -26,8 +26,8 @@ import static org.junit.Assert.assertFal import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem; -import org.apache.directory.shared.ldap.filter.ExprNode; -import org.apache.directory.shared.ldap.filter.FilterParser; +import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java Mon Jan 24 00:37:51 2011 @@ -30,7 +30,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.model.entry.EntryAttribute; -import org.apache.directory.shared.ldap.filter.UndefinedNode; +import org.apache.directory.shared.ldap.model.filter.UndefinedNode; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java Mon Jan 24 00:37:51 2011 @@ -25,8 +25,8 @@ import static org.junit.Assert.assertFal import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; -import org.apache.directory.shared.ldap.filter.SubstringNode; -import org.apache.directory.shared.ldap.filter.UndefinedNode; +import org.apache.directory.shared.ldap.model.filter.SubstringNode; +import org.apache.directory.shared.ldap.model.filter.UndefinedNode; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java Mon Jan 24 00:37:51 2011 @@ -25,7 +25,7 @@ import static org.junit.Assert.assertFal import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; -import org.apache.directory.shared.ldap.filter.UndefinedNode; +import org.apache.directory.shared.ldap.model.filter.UndefinedNode; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java Mon Jan 24 00:37:51 2011 @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; -import org.apache.directory.shared.ldap.filter.UndefinedNode; +import org.apache.directory.shared.ldap.model.filter.UndefinedNode; import org.apache.directory.shared.ldap.schema.AttributeType; import org.junit.Before; import org.junit.Test; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java Mon Jan 24 00:37:51 2011 @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; -import org.apache.directory.shared.ldap.filter.UndefinedNode; +import org.apache.directory.shared.ldap.model.filter.UndefinedNode; import org.apache.directory.shared.ldap.schema.AttributeType; import org.junit.Before; import org.junit.Test; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Mon Jan 24 00:37:51 2011 @@ -40,7 +40,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.model.message.SearchRequest; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Mon Jan 24 00:37:51 2011 @@ -38,7 +38,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.model.message.Control; Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Mon Jan 24 00:37:51 2011 @@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.ResponseCarryingException; import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.model.message.*; import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.SearchRequestImpl; Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java (from r1062578, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitorTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitorTest.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitorTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import static org.junit.Assert.assertEquals; @@ -26,6 +26,9 @@ import static org.junit.Assert.assertTru import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; +import org.apache.directory.shared.ldap.model.filter.BranchNormalizedVisitor; +import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.junit.Test; import org.junit.runner.RunWith; @@ -80,7 +83,7 @@ public class BranchNormalizedVisitorTest filter += "(|(uid=akarasulu)(ou=Human Resources))) "; - ExprNode ori = FilterParser.parse( filter ); + ExprNode ori = FilterParser.parse(filter); ExprNode altered = FilterParser.parse( filter ); Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java (from r1062578, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterCloneTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterCloneTest.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterCloneTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import static org.junit.Assert.assertEquals; @@ -29,6 +29,7 @@ import java.text.ParseException; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; +import org.apache.directory.shared.ldap.model.filter.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,7 +74,7 @@ public class FilterCloneTest // just check that it doesnt throw for now node = (BranchNode)node.clone(); assertEquals( 1, node.getChildren().size() ); - assertTrue( node instanceof AndNode ); + assertTrue( node instanceof AndNode); } @@ -160,7 +161,7 @@ public class FilterCloneTest @Test public void testNumericoidPresentFilter() throws ParseException { - PresenceNode node = ( PresenceNode ) FilterParser.parse( null, "(1.2.3.4=*)" ); + PresenceNode node = (PresenceNode) FilterParser.parse( null, "(1.2.3.4=*)" ); // just check that it doesnt throw for now node = ( PresenceNode )node.clone(); assertEquals( "1.2.3.4", node.getAttribute() ); @@ -463,7 +464,7 @@ public class FilterCloneTest @Test public void testSubstringAnyDoubleSpaceStar() throws ParseException { - SubstringNode node = ( SubstringNode ) FilterParser.parse( null, "(ou=foo* a *bar)" ); + SubstringNode node = (SubstringNode) FilterParser.parse( null, "(ou=foo* a *bar)" ); // just check that it doesnt throw for now node = ( SubstringNode ) node.clone(); Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java (from r1062580, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java Mon Jan 24 00:37:51 2011 @@ -17,12 +17,13 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.entry.StringValue; +import org.apache.directory.shared.ldap.model.filter.*; import org.junit.Test; import org.junit.runner.RunWith; Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java (from r1062580, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java&r1=1062580&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import static org.junit.Assert.assertEquals; @@ -33,6 +33,7 @@ import java.util.List; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.entry.StringValue; +import org.apache.directory.shared.ldap.model.filter.*; import org.junit.Test; import org.junit.runner.RunWith; @@ -135,7 +136,7 @@ public class FilterParserTest public void testOrFilterOneChildOnly() throws ParseException { String str = "(|(age>=30))"; - BranchNode node = ( BranchNode ) FilterParser.parse( str ); + BranchNode node = ( BranchNode ) FilterParser.parse(str); assertEquals( 1, node.getChildren().size() ); assertTrue( node instanceof OrNode ); String str2 = node.toString(); @@ -670,7 +671,7 @@ public class FilterParserTest String str = "(ou=foo* *bar)"; SubstringNode node = ( SubstringNode ) FilterParser.parse( str ); assertEquals( "ou", node.getAttribute() ); - assertTrue( node instanceof SubstringNode ); + assertTrue( node instanceof SubstringNode); assertEquals( 1, node.getAny().size() ); assertFalse( node.getAny().contains( "" ) ); @@ -1095,7 +1096,7 @@ public class FilterParserTest // Second child : (!(jagplayUserGroup=Banned)) ExprNode child2 = children1.get( 1 ); - assertTrue( child2 instanceof NotNode ); + assertTrue( child2 instanceof NotNode); NotNode notNode1 = ( NotNode ) child2; ExprNode notNodeChild1 = notNode1.getFirstChild(); Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java (from r1062578, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterToStringTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import static org.junit.Assert.assertEquals; @@ -26,6 +26,8 @@ import java.text.ParseException; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; +import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,7 +57,7 @@ public class FilterToStringTest assertEquals( str, node.toString() ); str = "(ou<=test)"; - node = FilterParser.parse( str ); + node = FilterParser.parse(str); assertEquals( str, node.toString() ); str="(ou=)"; Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java (from r1062578, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/LdapUrlTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/LdapUrlTest.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/LdapUrlTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java Mon Jan 24 00:37:51 2011 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import static org.junit.Assert.assertEquals; @@ -34,8 +34,10 @@ import org.apache.directory.junit.tools. import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.filter.LdapURL; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.name.Dn; -import org.apache.directory.shared.ldap.filter.LdapURL.Extension; +import org.apache.directory.shared.ldap.model.filter.LdapURL.Extension; import org.junit.Test; import org.junit.runner.RunWith; Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java (from r1062578, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/SubstringNodeTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/SubstringNodeTest.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/SubstringNodeTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java Mon Jan 24 00:37:51 2011 @@ -17,15 +17,15 @@ * under the License. * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; +import org.apache.directory.shared.ldap.model.filter.SubstringNode; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.List; import java.util.regex.Pattern; import static org.junit.Assert.*; Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java (from r1062578, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/UndefinedNodeTest.java) URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/UndefinedNodeTest.java&r1=1062578&r2=1062587&rev=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/UndefinedNodeTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java Mon Jan 24 00:37:51 2011 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.filter; +package org.apache.directory.shared.ldap.model.filter; import static org.junit.Assert.assertEquals; @@ -29,6 +29,7 @@ import java.util.List; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; +import org.apache.directory.shared.ldap.model.filter.*; import org.junit.Test; import org.junit.runner.RunWith; Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java Mon Jan 24 00:37:51 2011 @@ -29,7 +29,7 @@ import java.util.List; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.trigger.TriggerSpecification.SPSpec; import org.junit.Test; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Mon Jan 24 00:37:51 2011 @@ -37,8 +37,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.filter.FilterParser; -import org.apache.directory.shared.ldap.filter.SearchScope; +import org.apache.directory.shared.ldap.model.filter.FilterParser; +import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.model.ldif.ChangeType; import org.apache.directory.shared.ldap.model.ldif.LdifEntry; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; @@ -216,7 +216,7 @@ public class PartitionsDiffComputer setReturningAttributes( originalPartition.getSchemaManager(), attributeIds, soc ); soc.setDn( originalEntry.getDn() ); soc.setScope( SearchScope.ONELEVEL ); - soc.setFilter( FilterParser.parse( originalPartition.getSchemaManager(), "(objectClass=*)" ) ); + soc.setFilter( FilterParser.parse(originalPartition.getSchemaManager(), "(objectClass=*)") ); soc.setAliasDerefMode( AliasDerefMode.DEREF_ALWAYS ); // Looking for the children of the current entry Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java Mon Jan 24 00:37:51 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.connection.core; -import org.apache.directory.shared.ldap.filter.LdapURL; +import org.apache.directory.shared.ldap.model.filter.LdapURL; import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod; import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod; import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java?rev=1062587&r1=1062586&r2=1062587&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java Mon Jan 24 00:37:51 2011 @@ -28,7 +28,7 @@ import java.util.ResourceBundle; import javax.naming.directory.SearchControls; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.filter.LdapURL; +import org.apache.directory.shared.ldap.model.filter.LdapURL; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.Strings; import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;