directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379018 [3/4] - in /directory/trunks/clients: kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/ kerberos/examples/src/java/org/apache/kerberos/keytab/ ldap/src/main/java/org/apache/ldap/clients/ ldap/src/main/java/org/apache/...
Date Mon, 20 Feb 2006 04:00:37 GMT
Modified: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapModify.java
URL: http://svn.apache.org/viewcvs/directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapModify.java?rev=379018&r1=379017&r2=379018&view=diff
==============================================================================
--- directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapModify.java (original)
+++ directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapModify.java Sun Feb 19 20:00:33 2006
@@ -1,437 +1,437 @@
-/*
- *                                 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.
- *
- */
-
-package org.apache.ldap.clients;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.LinkedList;
-
-import javax.naming.NamingException;
-import javax.naming.directory.ModificationItem;
-
-import org.apache.ldap.common.ldif.LdifEntry;
-import org.apache.ldap.common.ldif.LdifParser;
-import org.apache.ldap.common.ldif.LdifParserImpl;
-import org.apache.ldap.common.message.BindResponse;
-import org.apache.ldap.common.message.LdapResult;
-import org.apache.ldap.common.message.MessageException;
-import org.apache.ldap.common.message.ModifyRequest;
-import org.apache.ldap.common.message.ModifyRequestImpl;
-import org.apache.ldap.common.message.ModifyResponse;
-import org.apache.ldap.common.message.ResultCodeEnum;
-
-/**
- * Ldap Modify Client
- * 
- * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
- * @author $$Author: jmachols $$
- * @version $$Revision$$
- */
-public class LdapModify extends LdapBind
-{
-    /**
-     * Create the client instance and loads the options from the command line
-     * arguments
-     * 
-     * @param args
-     *            Command line arguments
-     */
-    public LdapModify( String[] args )
-    {
-        super( args );
-    }
-
-    /**
-     * Get the inputStream to read the LDIF entries from. This will either be a
-     * file or STDIN based in the command line arguments
-     * 
-     * @return returns The inputStream to read LDIF entries from
-     */
-    public InputStream getStream()
-    {
-        ModifyOpts opts = (ModifyOpts) super.getOpts();
-        InputStream stream = null;
-        if( opts.usesLdifFile() )
-        {
-            try
-            {
-                stream = new FileInputStream( opts.getLdifFile() );
-            }
-            catch( FileNotFoundException e )
-            {
-                System.out.println( "Could not open LDIF file " + opts.getLdifFile() );
-                System.exit( -1 );
-            }
-        }
-        else
-        {
-            stream = System.in;
-        }
-        return stream;
-    }
-
-    /**
-     * Parse the input from the InputStream. For each LDIF entry found pass it
-     * to the modify method for processing. This will only segragate different
-     * entries, it won't breakdown the individual entries. There is a separate
-     * LDIF parsing class for that.
-     * 
-     * @param a_stream
-     *            The input stream to read the LDIF entries from
-     */
-    public void parseInput( InputStream a_stream )
-    {
-        // Setup the request
-        String line = new String();
-        StringBuffer buf = new StringBuffer();
-        int messageNum = 2;
-        BufferedReader stream = new BufferedReader( new InputStreamReader( a_stream ) );
-        try
-        {
-            while( (line = stream.readLine()) != null )
-            {
-                if( line.startsWith( "#" ) )
-                {
-                    continue;
-                }
-                if( line.trim().equals( "" ) )
-                {
-                    modify( buf, messageNum );
-                    messageNum++;
-                    buf.setLength( 0 );
-                    continue;
-                }
-                buf.append( line );
-                buf.append( '\n' );
-            }
-        }
-        catch( IOException e )
-        {
-            System.out.println( "error reading from input " + e.toString() );
-            System.exit( -1 );
-        }
-        modify( buf, messageNum );
-    }
-
-    /**
-     * Prepare the LDIF entry and send it to the encoder, then wait for a
-     * reponse from the LDAP server on the results of the operation.
-     * 
-     * @param a_buf
-     *            The string buffer that contain the LDIF entry
-     * @param id
-     *            the message id for the session
-     */
-    public void modify( StringBuffer a_buf, int id )
-    {
-        ModifyRequest request = new ModifyRequestImpl( id );
-        try
-        {
-            // ------------------------------------------
-            // We need to change this to lockableAttribute
-            // but that impl needs some work first
-            //-------------------------------------------
-            LdifParser parser = new LdifParserImpl();
-            LdifEntry ldifEntry = null;
-            ldifEntry = parser.parse( a_buf.toString() );
-
-            request.setName( ldifEntry.getDn() );
-            LinkedList items = ldifEntry.getModificationItems();
-            for( int index = 0; index < items.size(); index++ )
-            {
-                request.addModification( (ModificationItem) items.get( index ) );
-            }
-        }
-        catch( NamingException ne )
-        {
-            System.out.println( "Error parsing file " + ne.toString() );
-            System.exit( -1 );
-        }
-        
-        super.getEncoder().encodeBlocking( null, super.getOut(), request );
-
-        ModifyResponse modifyResponse = (ModifyResponse) super.getDecoder().decode( null, super.getIn() );
-        LdapResult result = modifyResponse.getLdapResult();
-        
-        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
-        {
-            System.out.println( "Modify of Entry " + request.getName() + " was successful" );
-        }
-        else
-        {
-            System.out.println( "Modify of entry " + request.getName()
-                    + " failed for the following reasons provided by the server:\n" + new String( result.getErrorMessage() ) );
-        }
-    }
-
-    /**
-     * The main method of the Modify client.
-     * 
-     * @param a_args
-     *            Command line arguments
-     */
-    public static void main( String[] args )
-    {
-        LdapModify client = new LdapModify( args );
-
-        BindResponse bindResponse = null;
-
-        try
-        {
-            bindResponse = client.bind( 1 );
-        }
-        catch( MessageException e )
-        {
-            System.out.println( "Failed to bind to server due to message composition failure" + e.getMessage() );
-            System.exit( 1 );
-        }
-        catch( IOException e )
-        {
-            System.out.println( "Failed to bind to server" + e.getMessage() );
-            System.exit( 1 );
-        }
-
-        // --------------------------------------------------------------------
-        // Report the results from the response.
-        // --------------------------------------------------------------------
-        client.getLog().debug( "Got back BindResponse from the server:\n" );
-        LdapResult result = bindResponse.getLdapResult();
-
-        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
-        {
-            System.out.println( "Authentication for " + client.getOpts().getBindDn() + " was successful" );
-        }
-        else
-        {
-            System.out.println( "Authentication for " + client.getOpts().getBindDn()
-                    + " failed for the following reasons provided by the server:\n" + new String( result.getErrorMessage() ) );
-            System.exit( -1 );
-        }
-
-        // --------------------------------------------------------------------
-        // Get the input method then parse each entry. The parsing method
-        // will submit the entry to the add routine
-        // --------------------------------------------------------------------
-        InputStream inStream = client.getStream();
-        client.parseInput( inStream );
-
-        // --------------------------------------------------------------------
-        // We are done, free up the socket connection
-        // --------------------------------------------------------------------
-        try
-        {
-            client.disconnect();
-        }
-        catch( IOException e )
-        {
-            client.getLog().error( "Failed to close client connection!", e );
-        }
-    }
+/*
+ *                                 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.
+ *
+ */
+
+package org.apache.ldap.clients;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.LinkedList;
+
+import javax.naming.NamingException;
+import javax.naming.directory.ModificationItem;
+
+import org.apache.ldap.common.ldif.LdifEntry;
+import org.apache.ldap.common.ldif.LdifParser;
+import org.apache.ldap.common.ldif.LdifParserImpl;
+import org.apache.ldap.common.message.BindResponse;
+import org.apache.ldap.common.message.LdapResult;
+import org.apache.ldap.common.message.MessageException;
+import org.apache.ldap.common.message.ModifyRequest;
+import org.apache.ldap.common.message.ModifyRequestImpl;
+import org.apache.ldap.common.message.ModifyResponse;
+import org.apache.ldap.common.message.ResultCodeEnum;
+
+/**
+ * Ldap Modify Client
+ * 
+ * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
+ * @author $$Author: jmachols $$
+ * @version $$Revision$$
+ */
+public class LdapModify extends LdapBind
+{
+    /**
+     * Create the client instance and loads the options from the command line
+     * arguments
+     * 
+     * @param args
+     *            Command line arguments
+     */
+    public LdapModify( String[] args )
+    {
+        super( args );
+    }
+
+    /**
+     * Get the inputStream to read the LDIF entries from. This will either be a
+     * file or STDIN based in the command line arguments
+     * 
+     * @return returns The inputStream to read LDIF entries from
+     */
+    public InputStream getStream()
+    {
+        ModifyOpts opts = (ModifyOpts) super.getOpts();
+        InputStream stream = null;
+        if( opts.usesLdifFile() )
+        {
+            try
+            {
+                stream = new FileInputStream( opts.getLdifFile() );
+            }
+            catch( FileNotFoundException e )
+            {
+                System.out.println( "Could not open LDIF file " + opts.getLdifFile() );
+                System.exit( -1 );
+            }
+        }
+        else
+        {
+            stream = System.in;
+        }
+        return stream;
+    }
+
+    /**
+     * Parse the input from the InputStream. For each LDIF entry found pass it
+     * to the modify method for processing. This will only segragate different
+     * entries, it won't breakdown the individual entries. There is a separate
+     * LDIF parsing class for that.
+     * 
+     * @param a_stream
+     *            The input stream to read the LDIF entries from
+     */
+    public void parseInput( InputStream a_stream )
+    {
+        // Setup the request
+        String line = new String();
+        StringBuffer buf = new StringBuffer();
+        int messageNum = 2;
+        BufferedReader stream = new BufferedReader( new InputStreamReader( a_stream ) );
+        try
+        {
+            while( (line = stream.readLine()) != null )
+            {
+                if( line.startsWith( "#" ) )
+                {
+                    continue;
+                }
+                if( line.trim().equals( "" ) )
+                {
+                    modify( buf, messageNum );
+                    messageNum++;
+                    buf.setLength( 0 );
+                    continue;
+                }
+                buf.append( line );
+                buf.append( '\n' );
+            }
+        }
+        catch( IOException e )
+        {
+            System.out.println( "error reading from input " + e.toString() );
+            System.exit( -1 );
+        }
+        modify( buf, messageNum );
+    }
+
+    /**
+     * Prepare the LDIF entry and send it to the encoder, then wait for a
+     * reponse from the LDAP server on the results of the operation.
+     * 
+     * @param a_buf
+     *            The string buffer that contain the LDIF entry
+     * @param id
+     *            the message id for the session
+     */
+    public void modify( StringBuffer a_buf, int id )
+    {
+        ModifyRequest request = new ModifyRequestImpl( id );
+        try
+        {
+            // ------------------------------------------
+            // We need to change this to lockableAttribute
+            // but that impl needs some work first
+            //-------------------------------------------
+            LdifParser parser = new LdifParserImpl();
+            LdifEntry ldifEntry = null;
+            ldifEntry = parser.parse( a_buf.toString() );
+
+            request.setName( ldifEntry.getDn() );
+            LinkedList items = ldifEntry.getModificationItems();
+            for( int index = 0; index < items.size(); index++ )
+            {
+                request.addModification( (ModificationItem) items.get( index ) );
+            }
+        }
+        catch( NamingException ne )
+        {
+            System.out.println( "Error parsing file " + ne.toString() );
+            System.exit( -1 );
+        }
+        
+        super.getEncoder().encodeBlocking( null, super.getOut(), request );
+
+        ModifyResponse modifyResponse = (ModifyResponse) super.getDecoder().decode( null, super.getIn() );
+        LdapResult result = modifyResponse.getLdapResult();
+        
+        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
+        {
+            System.out.println( "Modify of Entry " + request.getName() + " was successful" );
+        }
+        else
+        {
+            System.out.println( "Modify of entry " + request.getName()
+                    + " failed for the following reasons provided by the server:\n" + new String( result.getErrorMessage() ) );
+        }
+    }
+
+    /**
+     * The main method of the Modify client.
+     * 
+     * @param a_args
+     *            Command line arguments
+     */
+    public static void main( String[] args )
+    {
+        LdapModify client = new LdapModify( args );
+
+        BindResponse bindResponse = null;
+
+        try
+        {
+            bindResponse = client.bind( 1 );
+        }
+        catch( MessageException e )
+        {
+            System.out.println( "Failed to bind to server due to message composition failure" + e.getMessage() );
+            System.exit( 1 );
+        }
+        catch( IOException e )
+        {
+            System.out.println( "Failed to bind to server" + e.getMessage() );
+            System.exit( 1 );
+        }
+
+        // --------------------------------------------------------------------
+        // Report the results from the response.
+        // --------------------------------------------------------------------
+        client.getLog().debug( "Got back BindResponse from the server:\n" );
+        LdapResult result = bindResponse.getLdapResult();
+
+        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
+        {
+            System.out.println( "Authentication for " + client.getOpts().getBindDn() + " was successful" );
+        }
+        else
+        {
+            System.out.println( "Authentication for " + client.getOpts().getBindDn()
+                    + " failed for the following reasons provided by the server:\n" + new String( result.getErrorMessage() ) );
+            System.exit( -1 );
+        }
+
+        // --------------------------------------------------------------------
+        // Get the input method then parse each entry. The parsing method
+        // will submit the entry to the add routine
+        // --------------------------------------------------------------------
+        InputStream inStream = client.getStream();
+        client.parseInput( inStream );
+
+        // --------------------------------------------------------------------
+        // We are done, free up the socket connection
+        // --------------------------------------------------------------------
+        try
+        {
+            client.disconnect();
+        }
+        catch( IOException e )
+        {
+            client.getLog().error( "Failed to close client connection!", e );
+        }
+    }
 }

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapModify.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapModify.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Modified: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapSearch.java
URL: http://svn.apache.org/viewcvs/directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapSearch.java?rev=379018&r1=379017&r2=379018&view=diff
==============================================================================
--- directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapSearch.java (original)
+++ directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapSearch.java Sun Feb 19 20:00:33 2006
@@ -1,464 +1,464 @@
-/*
- *                                 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.
- *
- */
-
-package org.apache.ldap.clients;
-
-import java.io.IOException;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.FilterParser;
-import org.apache.ldap.common.filter.FilterParserImpl;
-import org.apache.ldap.common.message.DerefAliasesEnum;
-import org.apache.ldap.common.message.LdapResult;
-import org.apache.ldap.common.message.BindResponse;
-import org.apache.ldap.common.message.MessageException;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.message.SearchRequest;
-import org.apache.ldap.common.message.SearchRequestImpl;
-import org.apache.ldap.common.message.SearchResponseDoneImpl;
-import org.apache.ldap.common.message.SearchResponseEntryImpl;
-
-/**
- * Ldap client for the Search operation
- * 
- * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
- * @author $Author: jmachols $
- * @version $Revision$
- */
-public class LdapSearch extends LdapBind
-{
-
-    //private static LdapSearch m_client;
-
-    /**
-     * Create an instance of the search client and parse the command line
-     * arguments
-     * 
-     * @param args
-     *            Command line arguments
-     */
-    public LdapSearch( String[] args )
-    {
-        super( args );
-    }
-
-    public String requestToString( SearchRequest a_request )
-    {
-        String l_requestString = new String( "\t\t\t\tBase DN: " + a_request.getBase() + "\n\t\t\t\tDereference Alias: "
-                + a_request.getDerefAliases().getName().toString() + "[" + a_request.getDerefAliases().getValue() + "]"
-                + "\n\t\t\t\tFilter: " + a_request.getFilter() + "\n\t\t\t\tMessage ID: " + a_request.getMessageId()
-                + "\n\t\t\t\tSize Limit: " + a_request.getSizeLimit() + "\n\t\t\t\tTime Limit: " + a_request.getTimeLimit()
-                + "\n\t\t\t\tTypes Only: " + a_request.getTypesOnly() + "\n\t\t\t\tScope: "
-                + a_request.getScope().getName().toString() + "[" + a_request.getScope().getValue() + "]" );
-
-        return l_requestString;
-    }
-
-    /**
-     * Print each attribute name only. This is used when the Types Only mode is
-     * selected from the command line options
-     * 
-     * @param a_attributeList
-     *            NamingEnumeration of Attributes
-     */
-    public void printAttributeNames( NamingEnumeration a_attributeList )
-    {
-        Attribute l_attr;
-
-        while( a_attributeList.hasMoreElements() )
-        {
-            l_attr = (Attribute) a_attributeList.nextElement();
-            System.out.println( l_attr.getID() );
-        }
-    }
-
-    /**
-     * Print each attribute and the values for each attribute from the list
-     * passed into the method. Each attribute has an ID, which is the name of
-     * the attribute and a list of values. This is the default method for the
-     * search client output.
-     * 
-     * Each value of the same attribute will also print the ID, for example an
-     * entry with two value for objectclass will look like this:
-     * 
-     * ou=unix,ou=People,dc=fl,dc=wellspringres,dc=com objectClass=top
-     * objectClass=organizationalunit ou=unix
-     * 
-     * @param a_attributeList
-     *            NamingEnumeration of Attributes
-     */
-    public void printAttributeList( NamingEnumeration a_attributeList )
-    {
-
-        Attribute l_attr;
-        NamingEnumeration l_attrValues;
-
-        while( a_attributeList.hasMoreElements() )
-        {
-            l_attr = (Attribute) a_attributeList.nextElement();
-            try
-            {
-                l_attrValues = l_attr.getAll();
-                while( l_attrValues.hasMoreElements() )
-                {
-                    System.out.print( l_attr.getID() + "=" );
-                    System.out.println( l_attrValues.nextElement().toString() );
-                }
-            }
-            catch( NamingException e )
-            {
-                System.out.println( "Naming Exception thrown retreiving" + " values for attribute " + l_attr.getID() );
-            }
-        }
-    }
-
-    /**
-     * Create the Search Request encoded message and send it to the server, then
-     * process each response from the server
-     * 
-     * @param id
-     *            session message id
-     */
-    public void search( int id )
-    {
-        SearchOpts opts = (SearchOpts) super.getOpts();
-        SearchRequest request = new SearchRequestImpl( id );
-        Object response = new Object();
-        SearchResponseDoneImpl searchResponseDone = new SearchResponseDoneImpl( 1 );
-        SearchResponseEntryImpl searchResponseEntry;
-        FilterParser filter = null;
-        ExprNode expr = null;
-
-        filter = new FilterParserImpl();
-
-        try
-        {
-            expr = filter.parse( opts.getFilter() );
-        }
-        catch( java.text.ParseException pe )
-        {
-            getLog().fatal( "Parsing Exception ", pe );
-            System.exit( 1 );
-        }
-        catch( IOException ioe )
-        {
-            getLog().fatal( "IO Error while parsing the filter ", ioe );
-            System.exit( 1 );
-        }
-
-        getLog().debug( "Sucessfully paresed the filter: " + opts.getFilter() );
-
-        request.setFilter( expr );
-        request.setBase( opts.getBase() );
-        request.setScope( opts.getScope() );
-        request.setDerefAliases( DerefAliasesEnum.NEVERDEREFALIASES );
-        request.setTimeLimit( opts.getMaxTime() );
-        request.setSizeLimit( opts.getMaxEntries() );
-        request.setTypesOnly( opts.isTypesMode() );
-
-        getLog().debug(
-                "Sending the following request to the ldap" + " server " + opts.getHost() + ":" + opts.getPort() + "\n"
-                        + requestToString( request ) );
-
-        // Send encoded request to server
-        super.getEncoder().encodeBlocking( null, super.getOut(), request );
-
-        // Retrieve the response back from server to my last request.
-        response = super.getDecoder().decode( null, super.getIn() );
-        
-        while( !response.getClass().isInstance( searchResponseDone ) )
-        {
-            searchResponseEntry = (SearchResponseEntryImpl) response;
-            System.out.println( searchResponseEntry.getObjectName() );
-            if( opts.isTypesMode() )
-            {
-                printAttributeNames( searchResponseEntry.getAttributes().getAll() );
-            }
-            else
-                if( !opts.isQuietMode() )
-                {
-                    printAttributeList( searchResponseEntry.getAttributes().getAll() );
-                }
-            System.out.println();
-            response = super.getDecoder().decode( null, super.getIn() );
-        }
-
-        // We are done with the responses, the last one contains the status
-        searchResponseDone = (SearchResponseDoneImpl) response;
-        if( searchResponseDone.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
-        {
-            System.out.println( "Search failed for the following reasons :\n"
-                    + new String( searchResponseDone.getLdapResult().getErrorMessage() ) );
-            System.exit( -1 );
-        }
-        else
-        {
-            getLog().debug( "Search with filter " + opts.getFilter() + " was successful" );
-        }
-    }
-
-    /**
-     * The main will call trhe bind operation first. If that is successful, call
-     * the search and write the reponse from the server to the console
-     * 
-     * @param args
-     *            Command line string
-     */
-    public static void main( String[] args )
-    {
-        LdapSearch client = new LdapSearch( args );
-
-        BindResponse bindResponse = null;
-
-        try
-        {
-            bindResponse = client.bind( 1 );
-        }
-        catch( MessageException e )
-        {
-            System.out.println( "Failed to bind to server due to message composition failure" + e.getMessage() );
-            System.exit( 1 );
-        }
-        catch( IOException e )
-        {
-            System.out.println( "Failed to bind to server" + e.getMessage() );
-            System.exit( 1 );
-        }
-
-        // --------------------------------------------------------------------
-        // Report the results from the response.
-        // --------------------------------------------------------------------
-        client.getLog().debug( "Got back BindResponse from the server:\n" );
-        LdapResult result = bindResponse.getLdapResult();
-
-        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
-        {
-            System.out.println( "Authentication for " + client.getOpts().getBindDn() + " was successful" );
-        }
-        else
-        {
-            System.out.println(
-                    "Authentication for " + client.getOpts().getBindDn()
-                            + " failed for the following reasons provided by the server:\n"
-                            + new String( result.getErrorMessage() ) );
-            System.exit( -1 );
-        }
-
-        client.search( 2 );
-
-        try
-        {
-            client.disconnect();
-        }
-        catch( IOException e )
-        {
-            client.getLog().error( "Failed to close client connection!", e );
-        }
-    }
+/*
+ *                                 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.
+ *
+ */
+
+package org.apache.ldap.clients;
+
+import java.io.IOException;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.filter.FilterParser;
+import org.apache.ldap.common.filter.FilterParserImpl;
+import org.apache.ldap.common.message.DerefAliasesEnum;
+import org.apache.ldap.common.message.LdapResult;
+import org.apache.ldap.common.message.BindResponse;
+import org.apache.ldap.common.message.MessageException;
+import org.apache.ldap.common.message.ResultCodeEnum;
+import org.apache.ldap.common.message.SearchRequest;
+import org.apache.ldap.common.message.SearchRequestImpl;
+import org.apache.ldap.common.message.SearchResponseDoneImpl;
+import org.apache.ldap.common.message.SearchResponseEntryImpl;
+
+/**
+ * Ldap client for the Search operation
+ * 
+ * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
+ * @author $Author: jmachols $
+ * @version $Revision$
+ */
+public class LdapSearch extends LdapBind
+{
+
+    //private static LdapSearch m_client;
+
+    /**
+     * Create an instance of the search client and parse the command line
+     * arguments
+     * 
+     * @param args
+     *            Command line arguments
+     */
+    public LdapSearch( String[] args )
+    {
+        super( args );
+    }
+
+    public String requestToString( SearchRequest a_request )
+    {
+        String l_requestString = new String( "\t\t\t\tBase DN: " + a_request.getBase() + "\n\t\t\t\tDereference Alias: "
+                + a_request.getDerefAliases().getName().toString() + "[" + a_request.getDerefAliases().getValue() + "]"
+                + "\n\t\t\t\tFilter: " + a_request.getFilter() + "\n\t\t\t\tMessage ID: " + a_request.getMessageId()
+                + "\n\t\t\t\tSize Limit: " + a_request.getSizeLimit() + "\n\t\t\t\tTime Limit: " + a_request.getTimeLimit()
+                + "\n\t\t\t\tTypes Only: " + a_request.getTypesOnly() + "\n\t\t\t\tScope: "
+                + a_request.getScope().getName().toString() + "[" + a_request.getScope().getValue() + "]" );
+
+        return l_requestString;
+    }
+
+    /**
+     * Print each attribute name only. This is used when the Types Only mode is
+     * selected from the command line options
+     * 
+     * @param a_attributeList
+     *            NamingEnumeration of Attributes
+     */
+    public void printAttributeNames( NamingEnumeration a_attributeList )
+    {
+        Attribute l_attr;
+
+        while( a_attributeList.hasMoreElements() )
+        {
+            l_attr = (Attribute) a_attributeList.nextElement();
+            System.out.println( l_attr.getID() );
+        }
+    }
+
+    /**
+     * Print each attribute and the values for each attribute from the list
+     * passed into the method. Each attribute has an ID, which is the name of
+     * the attribute and a list of values. This is the default method for the
+     * search client output.
+     * 
+     * Each value of the same attribute will also print the ID, for example an
+     * entry with two value for objectclass will look like this:
+     * 
+     * ou=unix,ou=People,dc=fl,dc=wellspringres,dc=com objectClass=top
+     * objectClass=organizationalunit ou=unix
+     * 
+     * @param a_attributeList
+     *            NamingEnumeration of Attributes
+     */
+    public void printAttributeList( NamingEnumeration a_attributeList )
+    {
+
+        Attribute l_attr;
+        NamingEnumeration l_attrValues;
+
+        while( a_attributeList.hasMoreElements() )
+        {
+            l_attr = (Attribute) a_attributeList.nextElement();
+            try
+            {
+                l_attrValues = l_attr.getAll();
+                while( l_attrValues.hasMoreElements() )
+                {
+                    System.out.print( l_attr.getID() + "=" );
+                    System.out.println( l_attrValues.nextElement().toString() );
+                }
+            }
+            catch( NamingException e )
+            {
+                System.out.println( "Naming Exception thrown retreiving" + " values for attribute " + l_attr.getID() );
+            }
+        }
+    }
+
+    /**
+     * Create the Search Request encoded message and send it to the server, then
+     * process each response from the server
+     * 
+     * @param id
+     *            session message id
+     */
+    public void search( int id )
+    {
+        SearchOpts opts = (SearchOpts) super.getOpts();
+        SearchRequest request = new SearchRequestImpl( id );
+        Object response = new Object();
+        SearchResponseDoneImpl searchResponseDone = new SearchResponseDoneImpl( 1 );
+        SearchResponseEntryImpl searchResponseEntry;
+        FilterParser filter = null;
+        ExprNode expr = null;
+
+        filter = new FilterParserImpl();
+
+        try
+        {
+            expr = filter.parse( opts.getFilter() );
+        }
+        catch( java.text.ParseException pe )
+        {
+            getLog().fatal( "Parsing Exception ", pe );
+            System.exit( 1 );
+        }
+        catch( IOException ioe )
+        {
+            getLog().fatal( "IO Error while parsing the filter ", ioe );
+            System.exit( 1 );
+        }
+
+        getLog().debug( "Sucessfully paresed the filter: " + opts.getFilter() );
+
+        request.setFilter( expr );
+        request.setBase( opts.getBase() );
+        request.setScope( opts.getScope() );
+        request.setDerefAliases( DerefAliasesEnum.NEVERDEREFALIASES );
+        request.setTimeLimit( opts.getMaxTime() );
+        request.setSizeLimit( opts.getMaxEntries() );
+        request.setTypesOnly( opts.isTypesMode() );
+
+        getLog().debug(
+                "Sending the following request to the ldap" + " server " + opts.getHost() + ":" + opts.getPort() + "\n"
+                        + requestToString( request ) );
+
+        // Send encoded request to server
+        super.getEncoder().encodeBlocking( null, super.getOut(), request );
+
+        // Retrieve the response back from server to my last request.
+        response = super.getDecoder().decode( null, super.getIn() );
+        
+        while( !response.getClass().isInstance( searchResponseDone ) )
+        {
+            searchResponseEntry = (SearchResponseEntryImpl) response;
+            System.out.println( searchResponseEntry.getObjectName() );
+            if( opts.isTypesMode() )
+            {
+                printAttributeNames( searchResponseEntry.getAttributes().getAll() );
+            }
+            else
+                if( !opts.isQuietMode() )
+                {
+                    printAttributeList( searchResponseEntry.getAttributes().getAll() );
+                }
+            System.out.println();
+            response = super.getDecoder().decode( null, super.getIn() );
+        }
+
+        // We are done with the responses, the last one contains the status
+        searchResponseDone = (SearchResponseDoneImpl) response;
+        if( searchResponseDone.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
+        {
+            System.out.println( "Search failed for the following reasons :\n"
+                    + new String( searchResponseDone.getLdapResult().getErrorMessage() ) );
+            System.exit( -1 );
+        }
+        else
+        {
+            getLog().debug( "Search with filter " + opts.getFilter() + " was successful" );
+        }
+    }
+
+    /**
+     * The main will call trhe bind operation first. If that is successful, call
+     * the search and write the reponse from the server to the console
+     * 
+     * @param args
+     *            Command line string
+     */
+    public static void main( String[] args )
+    {
+        LdapSearch client = new LdapSearch( args );
+
+        BindResponse bindResponse = null;
+
+        try
+        {
+            bindResponse = client.bind( 1 );
+        }
+        catch( MessageException e )
+        {
+            System.out.println( "Failed to bind to server due to message composition failure" + e.getMessage() );
+            System.exit( 1 );
+        }
+        catch( IOException e )
+        {
+            System.out.println( "Failed to bind to server" + e.getMessage() );
+            System.exit( 1 );
+        }
+
+        // --------------------------------------------------------------------
+        // Report the results from the response.
+        // --------------------------------------------------------------------
+        client.getLog().debug( "Got back BindResponse from the server:\n" );
+        LdapResult result = bindResponse.getLdapResult();
+
+        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
+        {
+            System.out.println( "Authentication for " + client.getOpts().getBindDn() + " was successful" );
+        }
+        else
+        {
+            System.out.println(
+                    "Authentication for " + client.getOpts().getBindDn()
+                            + " failed for the following reasons provided by the server:\n"
+                            + new String( result.getErrorMessage() ) );
+            System.exit( -1 );
+        }
+
+        client.search( 2 );
+
+        try
+        {
+            client.disconnect();
+        }
+        catch( IOException e )
+        {
+            client.getLog().error( "Failed to close client connection!", e );
+        }
+    }
 }

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapSearch.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapSearch.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/LdapUnbind.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/ModifyOpts.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/Opts.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/Opts.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/SearchOpts.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/embedded/InputParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/embedded/LdapClient.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/embedded/LdapClientImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/embedded/LdapClientImpl.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/embedded/LdapClientResponse.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/embedded/LdapInputParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/embedded/LdapSearchParameters.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/ldaptest/LdapTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Propchange: directory/trunks/clients/ldap/src/main/java/org/apache/ldap/clients/ldaptest/LdapTestSession.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 20:00:33 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id



Mime
View raw message