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 2006/02/12 06:51:22 UTC

svn commit: r377135 [18/36] - in /directory/sandbox/akarasulu/rc1: apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ apacheds/core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ apacheds/core-shared/...

Modified: directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapBind.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapBind.java?rev=377135&r1=377134&r2=377135&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapBind.java (original)
+++ directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapBind.java Sat Feb 11 21:50:03 2006
@@ -1,627 +1,627 @@
-/*
- *                                 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.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import org.apache.ldap.common.message.BindRequestImpl;
-import org.apache.ldap.common.message.BindResponse;
-import org.apache.ldap.common.message.LdapResult;
-import org.apache.ldap.common.message.MessageDecoder;
-import org.apache.ldap.common.message.MessageEncoder;
-import org.apache.ldap.common.message.ResultCodeEnum;
-
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.ParseException;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-/**
- * Ldap client for the ADD operation
- *
- * @author <a href="mailto:jmachols@comcast.net">Jeff Machols</a>
- * @author $Author: jmachols $
- * @version $Revision$
- */
-public class LdapBind
-{
-    /**
-     * Instance of the logger
-     */
-    private static Logger log = Logger.getLogger(LdapBind.class);
-    
-    static {
-        BasicConfigurator.configure();
-    }
-    
-    /**
-     * The module's name
-     */
-    private String module = "LdapBind";
-    
-    /**
-     * Stream used to talk to the server
-     */
-    private InputStream in = null;
-    
-    /**
-     * Stream used to read from the server
-     */
-    private OutputStream out = null;
-
-    /**
-     * ASN1 Encoder class used to send messages to the LDAP server
-     */
-    private MessageDecoder decoder = null;
-    
-    /**
-     * ASN1 Decoder class used to translate messages from the LDAP server
-     */
-    private MessageEncoder encoder = null;
-
-    /**
-     * Command line options
-     */
-    private static BindOpts opts = null;
-    
-    /**
-     * Socket used to connect to the server
-     */
-    private Socket socket = null;
-
-    /**
-     * Get the module's name
-     * 
-     * @return Returns the module's name.
-     */
-    public String getModule()
-    {
-        return module;
-    }
-    
-    /**
-     * Set the logging priority of the logger object
-     * 
-     * @param level The level to set the logging to
-     */
-    public void enableLogging( Level level )
-    {
-        log.setLevel(level);
-    }
-
-    /**
-     * Get the message decoder used to tranform the ASN1 from the server
-     * 
-     * @return Message decoder used to tranform the ASN1 from the server
-     */
-    public MessageDecoder getDecoder()
-    {
-        return decoder;
-    }
-
-    /**
-     * Get the message encoder used to transform the message into ASN1 
-     * nototation being sent to the server
-     * 
-     * @return Message encoder used to transform the message into ASN1 
-     * nototation being sent to the server
-     */
-    public MessageEncoder getEncoder()
-    {
-        return encoder;
-    }
-
-    /**
-     * Get the input stream used to send messages to the server
-     *  
-     * @return Input stream used to send messages to the server
-     */
-    public InputStream getIn()
-    {
-        return in;
-    }
-
-    /**
-     * Get the instance of the logger
-     * 
-     * @return The logger
-     */
-    public Logger getLog()
-    {
-        return log;
-    }
-
-    /**
-     * Get the command line options from the clinet
-     * 
-     * @return The command line options object
-     */
-    public BindOpts getOpts()
-    {
-        return opts;
-    }
-
-    /**
-     * Get the output stream used to receive messages from the server
-     * 
-     * @return Ouput stream used to receive messages from the server
-     */
-    public OutputStream getOut()
-    {
-        return out;
-    }
-
-    /**
-     * Get the socket used to connect to the server machine
-     * 
-     * @return Socket used to connect to the server machine
-     */
-    public Socket getSocket()
-    {
-        return socket;
-    }
-
-    /**
-     * Set the module's name
-     * 
-     * @param module The module name to set.
-     */
-    public void setModule( String module )
-    {
-        this.module = module;
-    }
-    /**
-     * Set the Message decoder used to tranform the ASN1 from the server
-     * 
-     * @param decoder Message decoder used to tranform the ASN1 from 
-     * server
-     */
-    public void setDecoder( MessageDecoder decoder )
-    {
-        this.decoder = decoder;
-    }
-
-    /**
-     * Set the Message encoder used to transform the message into ASN1 
-     * nototation being sent to the server
-     * 
-     * @param encoder Message encoder used to transform the message into ASN1 
-     * nototation being sent to the server
-     */
-    public void setEncoder( MessageEncoder encoder )
-    {
-        this.encoder = encoder;
-    }
-
-    /**
-     * Set the input stream used to send messages to the server
-     * 
-     * @param stream Set the input stream used to send messages to the server
-     */
-    public void setIn( InputStream stream )
-    {
-        in = stream;
-    }
-
-    /**
-     * Set the instance of the logger
-     * 
-     * @param logger logger object
-     */
-    public void setLog( Logger logger )
-    {
-        log = logger;
-    }
-
-    /**
-     * Set the command line options from the clinet
-     * 
-     * @param opts Command line options from the clinet
-     */
-    public void setOpts( BindOpts opts )
-    {
-        LdapBind.opts = opts;
-    }
-
-    /**
-     * Set the output stream used to receive messages from the server
-     * 
-     * @param stream Output stream used to receive messages from the server
-
-     */
-    public void setOut( OutputStream stream )
-    {
-        out = stream;
-    }
-
-    /**
-     * Set the socket used to connect to the server machine
-     * 
-     * @param a_socket Socket used to connect to the server machine
-     */
-    public void setSocket( Socket socket )
-    {
-        this.socket = socket;
-    }
-
-    /**
-     * Take the command line string and pass it into the argument parser, 
-     * which will set our option flags.
-     * @param argv The command line string
-     */
-    public LdapBind(String[] argv) {
-        try {
-            opts = new BindOpts();
-            opts.process(argv);
-        } catch (ParseException pe) {
-            System.out.println("Error while parsing command line arguments : " + pe.getMessage());
-
-            StringBuffer sb = new StringBuffer();
-            
-            for (int i=0; i<argv.length; i++) {
-                sb.append(argv[i]).append(' ');
-            }
-            
-            System.out.println("Command line arguments : " + sb.toString());
-            HelpFormatter formatter = new HelpFormatter();
-            formatter.printHelp( module, opts.getOptions());
-            System.exit(1);
-        }
-
-        if (opts.isVerbose()) {
-            enableLogging(Level.DEBUG);
-        } else {
-            enableLogging(Level.INFO);
-        }
-    }
-
-    /**
-     *  Connect to the LDAP server through a socket and establish the
-     * Input and Output Streams.  All the required information for the
-     *  connection should be in the options from the command line, 
-     * or the default values.  
-     * 
-     * @throws UnknownHostException The hostname or the Address of 
-     * server could not be found
-     * @throws IOException There was a error opening or establishing the socket
-     */
-    public void connect() throws UnknownHostException, IOException
-    {
-        InetAddress l_address = InetAddress.getByName( opts.getHost() );
-        socket = new Socket( l_address, opts.getPort() );
-
-        // Set up the output stream to write to the server
-        out = new BufferedOutputStream( socket.getOutputStream() );
-        encoder = new MessageEncoder();
-
-        // Setup the input stream for reading from the server
-        in = socket.getInputStream();
-        decoder = new MessageDecoder();
-    }
-
-    /**
-     * Send the bind request to the LDAP server.  
-     * 
-     * @param id Message number of this request, If this is a simple
-     * bind, the ID will be one.
-     * @return The decoder response from the bind request 
-     * @throws UnknownHostException The hostname or the Address of 
-     * server could not be found
-     * @throws IOException There was a error opening or establishing the socket
-     */
-    public BindResponse bind( int id )
-        throws UnknownHostException, IOException
-    {
-        BindRequestImpl request = new BindRequestImpl( id );
-
-        // --------------------------------------------------------------------
-        // Build BindRequest
-        // --------------------------------------------------------------------
-
-        request.setName( opts.getBindDn() );
-        request.setSimple( true );
-        request.setCredentials( opts.getPassword().getBytes() );
-        request.setVersion3( opts.isVersion3() );
-
-        // --------------------------------------------------------------------
-        // Connect and deliver request to the server
-        // --------------------------------------------------------------------
-
-        if ( socket == null )
-        {
-            connect();
-        }
-
-        // Send encoded request to server
-        encoder.encodeBlocking( null, out, request );
-
-        // Retrieve the response back from server to my last request.
-        return ( BindResponse ) decoder.decode( null, in );
-    }
-
-    /**
-     * Close the socket
-     *  
-     * @throws IOException Could not close the socket
-     */
-    public void disconnect() throws IOException
-    {
-        if ( socket != null )
-        {
-            socket.close();
-        }
-    }
-
-    /**
-     * Main method for the Bind client.  All this will do is call the bind, 
-     * read the response, close the socket and report the response 
-     * of the bind operation
-     *
-     *  @param args Command line string
-     */
-    public static void main( String[] args )
-    {
-        LdapBind client = new LdapBind(args) ;
-        
-        BindResponse response = null ;
-
-        try
-        {
-            response = client.bind( 1 ) ;
-        }
-        catch ( IOException e ) 
-        {
-            client.getLog().fatal( 
-                "Failed to transmit pdu to server", e ) ;
-            System.exit( 1 ) ;
-        }
-        finally
-        {
-            try
-            {
-                client.disconnect(); 
-            }
-            catch ( Throwable t )
-            {
-                client.getLog().error(
-                    "Error while closing socket connection", t ) ;
-            }
-        }
-
-        // --------------------------------------------------------------------
-        // Report the results from the response.
-        // --------------------------------------------------------------------
-
-        client.getLog().debug( 
-            "Got back BindResponse from the server:\n" ) ;
-        LdapResult result = response.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 );
-        }
-    }
-}
+/*
+ *                                 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.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+import org.apache.ldap.common.message.BindRequestImpl;
+import org.apache.ldap.common.message.BindResponse;
+import org.apache.ldap.common.message.LdapResult;
+import org.apache.ldap.common.message.MessageDecoder;
+import org.apache.ldap.common.message.MessageEncoder;
+import org.apache.ldap.common.message.ResultCodeEnum;
+
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.ParseException;
+
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+/**
+ * Ldap client for the ADD operation
+ *
+ * @author <a href="mailto:jmachols@comcast.net">Jeff Machols</a>
+ * @author $Author: jmachols $
+ * @version $Revision$
+ */
+public class LdapBind
+{
+    /**
+     * Instance of the logger
+     */
+    private static Logger log = Logger.getLogger(LdapBind.class);
+    
+    static {
+        BasicConfigurator.configure();
+    }
+    
+    /**
+     * The module's name
+     */
+    private String module = "LdapBind";
+    
+    /**
+     * Stream used to talk to the server
+     */
+    private InputStream in = null;
+    
+    /**
+     * Stream used to read from the server
+     */
+    private OutputStream out = null;
+
+    /**
+     * ASN1 Encoder class used to send messages to the LDAP server
+     */
+    private MessageDecoder decoder = null;
+    
+    /**
+     * ASN1 Decoder class used to translate messages from the LDAP server
+     */
+    private MessageEncoder encoder = null;
+
+    /**
+     * Command line options
+     */
+    private static BindOpts opts = null;
+    
+    /**
+     * Socket used to connect to the server
+     */
+    private Socket socket = null;
+
+    /**
+     * Get the module's name
+     * 
+     * @return Returns the module's name.
+     */
+    public String getModule()
+    {
+        return module;
+    }
+    
+    /**
+     * Set the logging priority of the logger object
+     * 
+     * @param level The level to set the logging to
+     */
+    public void enableLogging( Level level )
+    {
+        log.setLevel(level);
+    }
+
+    /**
+     * Get the message decoder used to tranform the ASN1 from the server
+     * 
+     * @return Message decoder used to tranform the ASN1 from the server
+     */
+    public MessageDecoder getDecoder()
+    {
+        return decoder;
+    }
+
+    /**
+     * Get the message encoder used to transform the message into ASN1 
+     * nototation being sent to the server
+     * 
+     * @return Message encoder used to transform the message into ASN1 
+     * nototation being sent to the server
+     */
+    public MessageEncoder getEncoder()
+    {
+        return encoder;
+    }
+
+    /**
+     * Get the input stream used to send messages to the server
+     *  
+     * @return Input stream used to send messages to the server
+     */
+    public InputStream getIn()
+    {
+        return in;
+    }
+
+    /**
+     * Get the instance of the logger
+     * 
+     * @return The logger
+     */
+    public Logger getLog()
+    {
+        return log;
+    }
+
+    /**
+     * Get the command line options from the clinet
+     * 
+     * @return The command line options object
+     */
+    public BindOpts getOpts()
+    {
+        return opts;
+    }
+
+    /**
+     * Get the output stream used to receive messages from the server
+     * 
+     * @return Ouput stream used to receive messages from the server
+     */
+    public OutputStream getOut()
+    {
+        return out;
+    }
+
+    /**
+     * Get the socket used to connect to the server machine
+     * 
+     * @return Socket used to connect to the server machine
+     */
+    public Socket getSocket()
+    {
+        return socket;
+    }
+
+    /**
+     * Set the module's name
+     * 
+     * @param module The module name to set.
+     */
+    public void setModule( String module )
+    {
+        this.module = module;
+    }
+    /**
+     * Set the Message decoder used to tranform the ASN1 from the server
+     * 
+     * @param decoder Message decoder used to tranform the ASN1 from 
+     * server
+     */
+    public void setDecoder( MessageDecoder decoder )
+    {
+        this.decoder = decoder;
+    }
+
+    /**
+     * Set the Message encoder used to transform the message into ASN1 
+     * nototation being sent to the server
+     * 
+     * @param encoder Message encoder used to transform the message into ASN1 
+     * nototation being sent to the server
+     */
+    public void setEncoder( MessageEncoder encoder )
+    {
+        this.encoder = encoder;
+    }
+
+    /**
+     * Set the input stream used to send messages to the server
+     * 
+     * @param stream Set the input stream used to send messages to the server
+     */
+    public void setIn( InputStream stream )
+    {
+        in = stream;
+    }
+
+    /**
+     * Set the instance of the logger
+     * 
+     * @param logger logger object
+     */
+    public void setLog( Logger logger )
+    {
+        log = logger;
+    }
+
+    /**
+     * Set the command line options from the clinet
+     * 
+     * @param opts Command line options from the clinet
+     */
+    public void setOpts( BindOpts opts )
+    {
+        LdapBind.opts = opts;
+    }
+
+    /**
+     * Set the output stream used to receive messages from the server
+     * 
+     * @param stream Output stream used to receive messages from the server
+
+     */
+    public void setOut( OutputStream stream )
+    {
+        out = stream;
+    }
+
+    /**
+     * Set the socket used to connect to the server machine
+     * 
+     * @param a_socket Socket used to connect to the server machine
+     */
+    public void setSocket( Socket socket )
+    {
+        this.socket = socket;
+    }
+
+    /**
+     * Take the command line string and pass it into the argument parser, 
+     * which will set our option flags.
+     * @param argv The command line string
+     */
+    public LdapBind(String[] argv) {
+        try {
+            opts = new BindOpts();
+            opts.process(argv);
+        } catch (ParseException pe) {
+            System.out.println("Error while parsing command line arguments : " + pe.getMessage());
+
+            StringBuffer sb = new StringBuffer();
+            
+            for (int i=0; i<argv.length; i++) {
+                sb.append(argv[i]).append(' ');
+            }
+            
+            System.out.println("Command line arguments : " + sb.toString());
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.printHelp( module, opts.getOptions());
+            System.exit(1);
+        }
+
+        if (opts.isVerbose()) {
+            enableLogging(Level.DEBUG);
+        } else {
+            enableLogging(Level.INFO);
+        }
+    }
+
+    /**
+     *  Connect to the LDAP server through a socket and establish the
+     * Input and Output Streams.  All the required information for the
+     *  connection should be in the options from the command line, 
+     * or the default values.  
+     * 
+     * @throws UnknownHostException The hostname or the Address of 
+     * server could not be found
+     * @throws IOException There was a error opening or establishing the socket
+     */
+    public void connect() throws UnknownHostException, IOException
+    {
+        InetAddress l_address = InetAddress.getByName( opts.getHost() );
+        socket = new Socket( l_address, opts.getPort() );
+
+        // Set up the output stream to write to the server
+        out = new BufferedOutputStream( socket.getOutputStream() );
+        encoder = new MessageEncoder();
+
+        // Setup the input stream for reading from the server
+        in = socket.getInputStream();
+        decoder = new MessageDecoder();
+    }
+
+    /**
+     * Send the bind request to the LDAP server.  
+     * 
+     * @param id Message number of this request, If this is a simple
+     * bind, the ID will be one.
+     * @return The decoder response from the bind request 
+     * @throws UnknownHostException The hostname or the Address of 
+     * server could not be found
+     * @throws IOException There was a error opening or establishing the socket
+     */
+    public BindResponse bind( int id )
+        throws UnknownHostException, IOException
+    {
+        BindRequestImpl request = new BindRequestImpl( id );
+
+        // --------------------------------------------------------------------
+        // Build BindRequest
+        // --------------------------------------------------------------------
+
+        request.setName( opts.getBindDn() );
+        request.setSimple( true );
+        request.setCredentials( opts.getPassword().getBytes() );
+        request.setVersion3( opts.isVersion3() );
+
+        // --------------------------------------------------------------------
+        // Connect and deliver request to the server
+        // --------------------------------------------------------------------
+
+        if ( socket == null )
+        {
+            connect();
+        }
+
+        // Send encoded request to server
+        encoder.encodeBlocking( null, out, request );
+
+        // Retrieve the response back from server to my last request.
+        return ( BindResponse ) decoder.decode( null, in );
+    }
+
+    /**
+     * Close the socket
+     *  
+     * @throws IOException Could not close the socket
+     */
+    public void disconnect() throws IOException
+    {
+        if ( socket != null )
+        {
+            socket.close();
+        }
+    }
+
+    /**
+     * Main method for the Bind client.  All this will do is call the bind, 
+     * read the response, close the socket and report the response 
+     * of the bind operation
+     *
+     *  @param args Command line string
+     */
+    public static void main( String[] args )
+    {
+        LdapBind client = new LdapBind(args) ;
+        
+        BindResponse response = null ;
+
+        try
+        {
+            response = client.bind( 1 ) ;
+        }
+        catch ( IOException e ) 
+        {
+            client.getLog().fatal( 
+                "Failed to transmit pdu to server", e ) ;
+            System.exit( 1 ) ;
+        }
+        finally
+        {
+            try
+            {
+                client.disconnect(); 
+            }
+            catch ( Throwable t )
+            {
+                client.getLog().error(
+                    "Error while closing socket connection", t ) ;
+            }
+        }
+
+        // --------------------------------------------------------------------
+        // Report the results from the response.
+        // --------------------------------------------------------------------
+
+        client.getLog().debug( 
+            "Got back BindResponse from the server:\n" ) ;
+        LdapResult result = response.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 );
+        }
+    }
+}

Propchange: directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapBind.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapBind.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id

Modified: directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapDel.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapDel.java?rev=377135&r1=377134&r2=377135&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapDel.java (original)
+++ directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapDel.java Sat Feb 11 21:50:03 2006
@@ -1,338 +1,338 @@
-/*
- *                                 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 org.apache.ldap.common.message.LdapResult;
-import org.apache.ldap.common.message.BindResponse;
-import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.message.MessageException;
-import org.apache.ldap.common.message.DeleteRequestImpl;
-import org.apache.ldap.common.message.DeleteResponse;
-import org.apache.ldap.common.message.DeleteRequest;
-
-/**
- * Ldap client for the DELETE operation
- * 
- * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
- * @author $Author: jmachols $
- * @version $Revision$
- */
-public class LdapDel extends LdapBind
-{
-    /**
-     * Create an instance of the delete client and parse the command line
-     * arguments
-     * 
-     * @param args
-     *            Command line arguments
-     */
-    public LdapDel( String[] args )
-    {
-        super( args );
-    }
-
-    /**
-     * Encode the message for the delete of the entry and send the encoded
-     * message to the serever. Then wait for the serever to respond and decode
-     * that message
-     * 
-     * @param id
-     *            Message number being sent to the server in this transaction.
-     *            Since bind will be the fist, start with 2.
-     * 
-     * @return The LDAP response to the operation from the server
-     */
-    public DeleteResponse delete( int id )
-    {
-        DelOpts opts = (DelOpts) super.getOpts();
-        DeleteRequest request = new DeleteRequestImpl( id );
-        request.setName( opts.getDeletedDn() );
-
-        // Send encoded request to server
-        super.getEncoder().encodeBlocking( null, super.getOut(), request );
-
-        // Retrieve the response back from server to my last request.
-        return (DeleteResponse) super.getDecoder().decode( null, super.getIn() );
-    }
-
-    /**
-     * The main will call trhe bind operation first. If that is successful, call
-     * the delete and write the reponse from the server to the console
-     * 
-     * @param args
-     *            Command line string
-     */
-    public static void main( String[] args )
-    {
-        LdapDel client = new LdapDel( 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 )
-        {
-            client.getLog().info( "Authentication for " + client.getOpts().getBindDn() + " was successful" );
-        }
-        else
-        {
-            client.getLog().error(
-                    "Authentication for " + client.getOpts().getBindDn()
-                            + " failed for the following reasons provided by the server:\n"
-                            + new String( result.getErrorMessage() ) );
-            System.exit( -1 );
-        }
-
-        // --------------------------------------------------------------------
-        // Perform delete operation and report results
-        // --------------------------------------------------------------------
-
-        DeleteResponse l_delResponse = client.delete( 2 );
-        result = l_delResponse.getLdapResult();
-
-        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
-        {
-            System.out.println( "Delete of entry " + ((DelOpts) client.getOpts()).getDeletedDn() + " was successful" );
-        }
-        else
-        {
-            System.out.println( "Delete of entry " + ((DelOpts) client.getOpts()).getDeletedDn()
-                    + " failed for the following reasons provided by the server:\n" + new String( result.getErrorMessage() ) );
-            System.exit( -1 );
-        }
-
-        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 org.apache.ldap.common.message.LdapResult;
+import org.apache.ldap.common.message.BindResponse;
+import org.apache.ldap.common.message.ResultCodeEnum;
+import org.apache.ldap.common.message.MessageException;
+import org.apache.ldap.common.message.DeleteRequestImpl;
+import org.apache.ldap.common.message.DeleteResponse;
+import org.apache.ldap.common.message.DeleteRequest;
+
+/**
+ * Ldap client for the DELETE operation
+ * 
+ * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
+ * @author $Author: jmachols $
+ * @version $Revision$
+ */
+public class LdapDel extends LdapBind
+{
+    /**
+     * Create an instance of the delete client and parse the command line
+     * arguments
+     * 
+     * @param args
+     *            Command line arguments
+     */
+    public LdapDel( String[] args )
+    {
+        super( args );
+    }
+
+    /**
+     * Encode the message for the delete of the entry and send the encoded
+     * message to the serever. Then wait for the serever to respond and decode
+     * that message
+     * 
+     * @param id
+     *            Message number being sent to the server in this transaction.
+     *            Since bind will be the fist, start with 2.
+     * 
+     * @return The LDAP response to the operation from the server
+     */
+    public DeleteResponse delete( int id )
+    {
+        DelOpts opts = (DelOpts) super.getOpts();
+        DeleteRequest request = new DeleteRequestImpl( id );
+        request.setName( opts.getDeletedDn() );
+
+        // Send encoded request to server
+        super.getEncoder().encodeBlocking( null, super.getOut(), request );
+
+        // Retrieve the response back from server to my last request.
+        return (DeleteResponse) super.getDecoder().decode( null, super.getIn() );
+    }
+
+    /**
+     * The main will call trhe bind operation first. If that is successful, call
+     * the delete and write the reponse from the server to the console
+     * 
+     * @param args
+     *            Command line string
+     */
+    public static void main( String[] args )
+    {
+        LdapDel client = new LdapDel( 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 )
+        {
+            client.getLog().info( "Authentication for " + client.getOpts().getBindDn() + " was successful" );
+        }
+        else
+        {
+            client.getLog().error(
+                    "Authentication for " + client.getOpts().getBindDn()
+                            + " failed for the following reasons provided by the server:\n"
+                            + new String( result.getErrorMessage() ) );
+            System.exit( -1 );
+        }
+
+        // --------------------------------------------------------------------
+        // Perform delete operation and report results
+        // --------------------------------------------------------------------
+
+        DeleteResponse l_delResponse = client.delete( 2 );
+        result = l_delResponse.getLdapResult();
+
+        if( result.getResultCode() == ResultCodeEnum.SUCCESS )
+        {
+            System.out.println( "Delete of entry " + ((DelOpts) client.getOpts()).getDeletedDn() + " was successful" );
+        }
+        else
+        {
+            System.out.println( "Delete of entry " + ((DelOpts) client.getOpts()).getDeletedDn()
+                    + " failed for the following reasons provided by the server:\n" + new String( result.getErrorMessage() ) );
+            System.exit( -1 );
+        }
+
+        try
+        {
+            client.disconnect();
+        }
+        catch( IOException e )
+        {
+            client.getLog().error( "Failed to close client connection!", e );
+        }
+    }
 }

Propchange: directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapDel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapDel.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -1 +1,4 @@
 Rev
+Revision
+Date
+Id