You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/09/30 03:53:00 UTC
svn commit: rev 47524 - in incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common: filter message util
Author: akarasulu
Date: Wed Sep 29 18:52:59 2004
New Revision: 47524
Modified:
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/filter/ScopeNode.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/DerefAliasesEnum.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/LRUMap.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/SequencedHashMap.java
Log:
cleaned up other deps that are not necessary
Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/filter/ScopeNode.java
==============================================================================
--- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/filter/ScopeNode.java (original)
+++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/filter/ScopeNode.java Wed Sep 29 18:52:59 2004
@@ -1,222 +1,25 @@
-/*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/
- *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- * 1. Definitions.
- *
- * "License" shall mean the terms and conditions for use, reproduction,
- * and distribution as defined by Sections 1 through 9 of this document.
- *
- * "Licensor" shall mean the copyright owner or entity authorized by
- * the copyright owner that is granting the License.
- *
- * "Legal Entity" shall mean the union of the acting entity and all
- * other entities that control, are controlled by, or are under common
- * control with that entity. For the purposes of this definition,
- * "control" means (i) the power, direct or indirect, to cause the
- * direction or management of such entity, whether by contract or
- * otherwise, or (ii) ownership of fifty percent (50%) or more of the
- * outstanding shares, or (iii) beneficial ownership of such entity.
- *
- * "You" (or "Your") shall mean an individual or Legal Entity
- * exercising permissions granted by this License.
- *
- * "Source" form shall mean the preferred form for making modifications,
- * including but not limited to software source code, documentation
- * source, and configuration files.
- *
- * "Object" form shall mean any form resulting from mechanical
- * transformation or translation of a Source form, including but
- * not limited to compiled object code, generated documentation,
- * and conversions to other media types.
- *
- * "Work" shall mean the work of authorship, whether in Source or
- * Object form, made available under the License, as indicated by a
- * copyright notice that is included in or attached to the work
- * (an example is provided in the Appendix below).
- *
- * "Derivative Works" shall mean any work, whether in Source or Object
- * form, that is based on (or derived from) the Work and for which the
- * editorial revisions, annotations, elaborations, or other modifications
- * represent, as a whole, an original work of authorship. For the purposes
- * of this License, Derivative Works shall not include works that remain
- * separable from, or merely link (or bind by name) to the interfaces of,
- * the Work and Derivative Works thereof.
- *
- * "Contribution" shall mean any work of authorship, including
- * the original version of the Work and any modifications or additions
- * to that Work or Derivative Works thereof, that is intentionally
- * submitted to Licensor for inclusion in the Work by the copyright owner
- * or by an individual or Legal Entity authorized to submit on behalf of
- * the copyright owner. For the purposes of this definition, "submitted"
- * means any form of electronic, verbal, or written communication sent
- * to the Licensor or its representatives, including but not limited to
- * communication on electronic mailing lists, source code control systems,
- * and issue tracking systems that are managed by, or on behalf of, the
- * Licensor for the purpose of discussing and improving the Work, but
- * excluding communication that is conspicuously marked or otherwise
- * designated in writing by the copyright owner as "Not a Contribution."
- *
- * "Contributor" shall mean Licensor and any individual or Legal Entity
- * on behalf of whom a Contribution has been received by Licensor and
- * subsequently incorporated within the Work.
- *
- * 2. Grant of Copyright License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * copyright license to reproduce, prepare Derivative Works of,
- * publicly display, publicly perform, sublicense, and distribute the
- * Work and such Derivative Works in Source or Object form.
- *
- * 3. Grant of Patent License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * (except as stated in this section) patent license to make, have made,
- * use, offer to sell, sell, import, and otherwise transfer the Work,
- * where such license applies only to those patent claims licensable
- * by such Contributor that are necessarily infringed by their
- * Contribution(s) alone or by combination of their Contribution(s)
- * with the Work to which such Contribution(s) was submitted. If You
- * institute patent litigation against any entity (including a
- * cross-claim or counterclaim in a lawsuit) alleging that the Work
- * or a Contribution incorporated within the Work constitutes direct
- * or contributory patent infringement, then any patent licenses
- * granted to You under this License for that Work shall terminate
- * as of the date such litigation is filed.
- *
- * 4. Redistribution. You may reproduce and distribute copies of the
- * Work or Derivative Works thereof in any medium, with or without
- * modifications, and in Source or Object form, provided that You
- * meet the following conditions:
- *
- * (a) You must give any other recipients of the Work or
- * Derivative Works a copy of this License; and
- *
- * (b) You must cause any modified files to carry prominent notices
- * stating that You changed the files; and
- *
- * (c) You must retain, in the Source form of any Derivative Works
- * that You distribute, all copyright, patent, trademark, and
- * attribution notices from the Source form of the Work,
- * excluding those notices that do not pertain to any part of
- * the Derivative Works; and
- *
- * (d) If the Work includes a "NOTICE" text file as part of its
- * distribution, then any Derivative Works that You distribute must
- * include a readable copy of the attribution notices contained
- * within such NOTICE file, excluding those notices that do not
- * pertain to any part of the Derivative Works, in at least one
- * of the following places: within a NOTICE text file distributed
- * as part of the Derivative Works; within the Source form or
- * documentation, if provided along with the Derivative Works; or,
- * within a display generated by the Derivative Works, if and
- * wherever such third-party notices normally appear. The contents
- * of the NOTICE file are for informational purposes only and
- * do not modify the License. You may add Your own attribution
- * notices within Derivative Works that You distribute, alongside
- * or as an addendum to the NOTICE text from the Work, provided
- * that such additional attribution notices cannot be construed
- * as modifying the License.
- *
- * You may add Your own copyright statement to Your modifications and
- * may provide additional or different license terms and conditions
- * for use, reproduction, or distribution of Your modifications, or
- * for any such Derivative Works as a whole, provided Your use,
- * reproduction, and distribution of the Work otherwise complies with
- * the conditions stated in this License.
- *
- * 5. Submission of Contributions. Unless You explicitly state otherwise,
- * any Contribution intentionally submitted for inclusion in the Work
- * by You to the Licensor shall be under the terms and conditions of
- * this License, without any additional terms or conditions.
- * Notwithstanding the above, nothing herein shall supersede or modify
- * the terms of any separate license agreement you may have executed
- * with Licensor regarding such Contributions.
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- * names, trademarks, service marks, or product names of the Licensor,
- * except as required for reasonable and customary use in describing the
- * origin of the Work and reproducing the content of the NOTICE file.
- *
- * 7. Disclaimer of Warranty. Unless required by applicable law or
- * agreed to in writing, Licensor provides the Work (and each
- * Contributor provides its Contributions) on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied, including, without limitation, any warranties or conditions
- * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- * PARTICULAR PURPOSE. You are solely responsible for determining the
- * appropriateness of using or redistributing the Work and assume any
- * risks associated with Your exercise of permissions under this License.
- *
- * 8. Limitation of Liability. In no event and under no legal theory,
- * whether in tort (including negligence), contract, or otherwise,
- * unless required by applicable law (such as deliberate and grossly
- * negligent acts) or agreed to in writing, shall any Contributor be
- * liable to You for damages, including any direct, indirect, special,
- * incidental, or consequential damages of any character arising as a
- * result of this License or out of the use or inability to use the
- * Work (including but not limited to damages for loss of goodwill,
- * work stoppage, computer failure or malfunction, or any and all
- * other commercial damages or losses), even if such Contributor
- * has been advised of the possibility of such damages.
- *
- * 9. Accepting Warranty or Additional Liability. While redistributing
- * the Work or Derivative Works thereof, You may choose to offer,
- * and charge a fee for, acceptance of support, warranty, indemnity,
- * or other liability obligations and/or rights consistent with this
- * License. However, in accepting such obligations, You may act only
- * on Your own behalf and on Your sole responsibility, not on behalf
- * of any other Contributor, and only if You agree to indemnify,
- * defend, and hold each Contributor harmless for any liability
- * incurred by, or claims asserted against, such Contributor by reason
- * of your accepting any such warranty or additional liability.
- *
- * END OF TERMS AND CONDITIONS
- *
- * APPENDIX: How to apply the Apache License to your work.
- *
- * To apply the Apache License to your work, attach the following
- * boilerplate notice, with the fields enclosed by brackets "[]"
- * replaced with your own identifying information. (Don't include
- * the brackets!) The text should be enclosed in the appropriate
- * comment syntax for the file format. We also recommend that a
- * file or class name and description of purpose be included on the
- * same "printed page" as the copyright notice for easier
- * identification within third-party archives.
- *
- * Copyright [yyyy] [name of copyright owner]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
/*
- * $Id: ScopeNode.java,v 1.9 2003/10/14 04:59:23 akarasulu Exp $
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * -- (c) LDAPd Group
- * -- Please refer to the LICENSE.txt file in the root directory of --
- * -- any LDAPd project for copyright and distribution information. --
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
*/
-package org.apache.ldap.common.filter ;
+package org.apache.ldap.common.filter;
-import java.util.Hashtable;
+import java.util.Map;
-import javax.naming.directory.SearchControls ;
+import javax.naming.directory.SearchControls;
import org.apache.ldap.common.message.DerefAliasesEnum;
@@ -225,64 +28,62 @@
* Node used not to represent an published assertion but an assertion on the
* scope of the search.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $author$
- * @version $Revision: 1.9 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class ScopeNode extends AbstractExprNode
{
/** the scope of this node */
- private final int m_scope ;
+ private final int scope;
/** the search base */
- private final String m_baseDn ;
+ private final String baseDn;
/** the alias dereferencing mode */
- private final DerefAliasesEnum m_derefAliases ;
+ private final DerefAliasesEnum derefAliases;
/**
* Creates a new ScopeNode object.
*
- * @param a_derefAliases the alias dereferencing mode
- * @param a_baseDn the search base
- * @param a_scope the search scope
- */
- public ScopeNode( DerefAliasesEnum a_derefAliases, String a_baseDn,
- int a_scope )
- {
- super ( SCOPE ) ;
- m_scope = a_scope ;
- m_baseDn = a_baseDn ;
- m_derefAliases = a_derefAliases ;
+ * @param derefAliases the alias dereferencing mode
+ * @param baseDn the search base
+ * @param scope the search scope
+ */
+ public ScopeNode( DerefAliasesEnum derefAliases, String baseDn, int scope )
+ {
+ super ( SCOPE );
+ this.scope = scope;
+ this.baseDn = baseDn;
+ this.derefAliases = derefAliases;
}
/**
* Creates a new ScopeNode object.
*
- * @param a_env the JNDI environment from which to extract the alias
+ * @param env the JNDI environment from which to extract the alias
* dereferencing mode
- * @param a_baseDn the search base
- * @param a_scope the search scope
+ * @param baseDn the search base
+ * @param scope the search scope
*/
- public ScopeNode( Hashtable a_env, String a_baseDn, int a_scope )
+ public ScopeNode( Map env, String baseDn, int scope )
{
- super ( SCOPE ) ;
- m_scope = a_scope ;
- m_baseDn = a_baseDn ;
- m_derefAliases = DerefAliasesEnum.getEnum( a_env ) ;
+ super ( SCOPE );
+ this.scope = scope;
+ this.baseDn = baseDn;
+ this.derefAliases = DerefAliasesEnum.getEnum( env );
}
/**
* Always returns true since a scope node has no children.
*
- * @see org.apache.ldap.common.filter.ExprNode#isLeaf()
+ * @see ExprNode#isLeaf()
*/
public boolean isLeaf()
{
- return true ;
+ return true;
}
@@ -290,13 +91,13 @@
* Gets the scope constant for this node.
*
* @return the scope constant
- * @see javax.naming.directory.SearchControls.OBJECT_SCOPE
- * @see javax.naming.directory.SearchControls.ONELEVEL_SCOPE
- * @see javax.naming.directory.SearchControls.SUBTREE_SCOPE
+ * @see SearchControls.OBJECT_SCOPE
+ * @see SearchControls.ONELEVEL_SCOPE
+ * @see SearchControls.SUBTREE_SCOPE
*/
public int getScope()
{
- return m_scope ;
+ return this.scope;
}
@@ -307,7 +108,7 @@
*/
public String getBaseDn()
{
- return m_baseDn ;
+ return this.baseDn;
}
@@ -318,42 +119,42 @@
*/
public DerefAliasesEnum getDerefAliases()
{
- return m_derefAliases ;
+ return this.derefAliases;
}
/**
- * @see org.apache.ldap.common.filter.ExprNode#printToBuffer(java.lang.StringBuffer)
+ * @see ExprNode#printToBuffer(StringBuffer)
*/
- public void printToBuffer( StringBuffer a_buf )
+ public void printToBuffer( StringBuffer buf )
{
- switch ( m_scope )
+ switch ( this.scope )
{
case ( SearchControls.OBJECT_SCOPE ):
- a_buf.append( "OBJECT_SCOPE" ) ;
+ buf.append( "OBJECT_SCOPE" );
- break ;
+ break;
case ( SearchControls.ONELEVEL_SCOPE ):
- a_buf.append( "ONELEVEL_SCOPE" ) ;
+ buf.append( "ONELEVEL_SCOPE" );
- break ;
+ break;
case ( SearchControls.SUBTREE_SCOPE ):
- a_buf.append( "SUBTREE_SCOPE (Estimated)" ) ;
+ buf.append( "SUBTREE_SCOPE (Estimated)" );
- break ;
+ break;
default:
- a_buf.append( "UNKNOWN" ) ;
+ buf.append( "UNKNOWN" );
}
if ( getAnnotations().containsKey( "count" ) )
{
- a_buf.append( " [" ) ;
- a_buf.append( getAnnotations().get( "count" ).toString() ) ;
- a_buf.append( ']' ) ;
+ buf.append( " [" );
+ buf.append( getAnnotations().get( "count" ).toString() );
+ buf.append( ']' );
}
}
@@ -362,11 +163,11 @@
* @see org.apache.ldap.common.filter.ExprNode#accept(
* org.apache.ldap.common.filter.FilterVisitor)
*/
- public void accept( FilterVisitor a_visitor )
+ public void accept( FilterVisitor visitor )
{
- if ( a_visitor.canVisit( this ) )
+ if ( visitor.canVisit( this ) )
{
- a_visitor.visit( this ) ;
+ visitor.visit( this );
}
}
}
Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/DerefAliasesEnum.java
==============================================================================
--- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/DerefAliasesEnum.java (original)
+++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/DerefAliasesEnum.java Wed Sep 29 18:52:59 2004
@@ -18,6 +18,7 @@
import java.util.Hashtable ;
+import java.util.Map;
import org.apache.ldap.common.util.ValuedEnum;
@@ -192,12 +193,12 @@
* specific environment property, java.naming.ldap.derefAliases, from the
* environment.
*
- * @param a_env the JNDI environment with a potential value for the
+ * @param env the JNDI environment with a potential value for the
* java.naming.ldap.derefAliases property
* @return the enumeration for the environment
*/
- public static DerefAliasesEnum getEnum( Hashtable a_env )
+ public static DerefAliasesEnum getEnum( Map env )
{
- return getEnum( ( String ) a_env.get( JNDI_PROP ) ) ;
+ return getEnum( ( String ) env.get( JNDI_PROP ) ) ;
}
}
Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/LRUMap.java
==============================================================================
--- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/LRUMap.java (original)
+++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/LRUMap.java Wed Sep 29 18:52:59 2004
@@ -42,7 +42,6 @@
* key is now equivalent to LRUMap.getFirst().
* </p>
*
- * @deprecated Moved to map subpackage. Due to be removed in v4.0.
* @since Commons Collections 1.0
* @version $Revision: 1.23 $ $Date: 2004/02/18 01:15:42 $
*
Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/SequencedHashMap.java
==============================================================================
--- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/SequencedHashMap.java (original)
+++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/util/SequencedHashMap.java Wed Sep 29 18:52:59 2004
@@ -36,7 +36,6 @@
* required, use {@link java.util.Collections#synchronizedMap(Map)} as it is documented,
* or use explicit synchronization controls.
*
- * @deprecated Replaced by LinkedMap and ListOrderedMap in map subpackage. Due to be removed in v4.0.
* @since Commons Collections 2.0
* @version $Revision: 1.28 $ $Date: 2004/02/18 01:15:42 $
*