directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r377135 [17/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/...
Date Sun, 12 Feb 2006 05:51:22 GMT
Modified: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/AddObjectClassesToEntryTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/AddObjectClassesToEntryTest.java?rev=377135&r1=377134&r2=377135&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/AddObjectClassesToEntryTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/AddObjectClassesToEntryTest.java Sat Feb 11 21:50:03 2006
@@ -1,168 +1,168 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   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.directory.server;
-
-
-import javax.naming.directory.*;
-import javax.naming.NamingException;
-
-import org.apache.directory.server.unit.AbstractServerTest;
-
-import java.util.Hashtable;
-
-
-/**
- * Test case to verify DIREVE-216.  Starts up the server binds via SUN JNDI provider
- * to perform add modify operations on entries.
- * 
- * @author szoerner
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class AddObjectClassesToEntryTest extends AbstractServerTest
-{
-    private static final String RDN = "cn=The Person";
-
-    private DirContext ctx = null;
-
-
-    /**
-     * Create an entry for a person.
-     */
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        Hashtable env = new Hashtable();
-        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
-        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
-        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
-        env.put( "java.naming.security.credentials", "secret" );
-        env.put( "java.naming.security.authentication", "simple" );
-        ctx = new InitialDirContext( env );
-
-        // Create a person
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "person" );
-        attributes.put( attribute );
-        attributes.put( "cn", "The Person" );
-        attributes.put( "sn", "Person" );
-        attributes.put( "description", "this is a person" );
-        DirContext person = ctx.createSubcontext( RDN, attributes );
-
-        assertNotNull( person );
-    }
-
-
-    /**
-     * Remove the person.
-     */
-    public void tearDown() throws Exception
-    {
-        ctx.unbind( RDN );
-        ctx.close();
-        ctx = null;
-        super.tearDown();
-    }
-
-
-    /**
-     * Just a little test to check wether the person is created correctly after
-     * setup.
-     * 
-     * @throws NamingException
-     */
-    public void testSetUpTearDown() throws NamingException
-    {
-        DirContext person = ( DirContext ) ctx.lookup( RDN );
-        assertNotNull( person );
-
-        // Check object classes
-
-        Attributes attributes = person.getAttributes( "" );
-        Attribute ocls = attributes.get( "objectClass" );
-
-        String[] expectedOcls =
-            { "top", "person" };
-        for ( int i = 0; i < expectedOcls.length; i++ )
-        {
-            String name = expectedOcls[i];
-            assertTrue( "object class " + name + " is NOT present when it should be!", ocls.contains( name ) );
-        }
-    }
-
-
-    /**
-     * This is the original defect as in JIRA DIREVE-216.
-     * 
-     * @throws NamingException
-     */
-    public void testAddObjectClasses() throws NamingException
-    {
-
-        // modify object classes, add two more
-        Attributes attributes = new BasicAttributes( true );
-        Attribute ocls = new BasicAttribute( "objectClass" );
-        ocls.add( "organizationalPerson" );
-        ocls.add( "inetOrgPerson" );
-        attributes.put( ocls );
-
-        DirContext person = ( DirContext ) ctx.lookup( RDN );
-        person.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, attributes );
-
-        // Read again from directory
-        person = ( DirContext ) ctx.lookup( RDN );
-        attributes = person.getAttributes( "" );
-        Attribute newOcls = attributes.get( "objectClass" );
-
-        String[] expectedOcls =
-            { "top", "person", "organizationalPerson", "inetOrgPerson" };
-        for ( int i = 0; i < expectedOcls.length; i++ )
-        {
-            String name = expectedOcls[i];
-            assertTrue( "object class " + name + " is present", newOcls.contains( name ) );
-        }
-    }
-
-
-    /**
-     * This changes a single attribute value. Just as a reference.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyDescription() throws NamingException
-    {
-        String newDescription = "More info on the user ...";
-
-        // modify object classes, add two more
-        Attributes attributes = new BasicAttributes( true );
-        Attribute desc = new BasicAttribute( "description", newDescription );
-        attributes.put( desc );
-
-        DirContext person = ( DirContext ) ctx.lookup( RDN );
-        person.modifyAttributes( "", DirContext.REPLACE_ATTRIBUTE, attributes );
-
-        // Read again from directory
-        person = ( DirContext ) ctx.lookup( RDN );
-        attributes = person.getAttributes( "" );
-        Attribute newDesc = attributes.get( "description" );
-
-        assertTrue( "new Description", newDesc.contains( newDescription ) );
-    }
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   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.directory.server;
+
+
+import javax.naming.directory.*;
+import javax.naming.NamingException;
+
+import org.apache.directory.server.unit.AbstractServerTest;
+
+import java.util.Hashtable;
+
+
+/**
+ * Test case to verify DIREVE-216.  Starts up the server binds via SUN JNDI provider
+ * to perform add modify operations on entries.
+ * 
+ * @author szoerner
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class AddObjectClassesToEntryTest extends AbstractServerTest
+{
+    private static final String RDN = "cn=The Person";
+
+    private DirContext ctx = null;
+
+
+    /**
+     * Create an entry for a person.
+     */
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        Hashtable env = new Hashtable();
+        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
+        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.credentials", "secret" );
+        env.put( "java.naming.security.authentication", "simple" );
+        ctx = new InitialDirContext( env );
+
+        // Create a person
+        Attributes attributes = new BasicAttributes( true );
+        Attribute attribute = new BasicAttribute( "objectClass" );
+        attribute.add( "top" );
+        attribute.add( "person" );
+        attributes.put( attribute );
+        attributes.put( "cn", "The Person" );
+        attributes.put( "sn", "Person" );
+        attributes.put( "description", "this is a person" );
+        DirContext person = ctx.createSubcontext( RDN, attributes );
+
+        assertNotNull( person );
+    }
+
+
+    /**
+     * Remove the person.
+     */
+    public void tearDown() throws Exception
+    {
+        ctx.unbind( RDN );
+        ctx.close();
+        ctx = null;
+        super.tearDown();
+    }
+
+
+    /**
+     * Just a little test to check wether the person is created correctly after
+     * setup.
+     * 
+     * @throws NamingException
+     */
+    public void testSetUpTearDown() throws NamingException
+    {
+        DirContext person = ( DirContext ) ctx.lookup( RDN );
+        assertNotNull( person );
+
+        // Check object classes
+
+        Attributes attributes = person.getAttributes( "" );
+        Attribute ocls = attributes.get( "objectClass" );
+
+        String[] expectedOcls =
+            { "top", "person" };
+        for ( int i = 0; i < expectedOcls.length; i++ )
+        {
+            String name = expectedOcls[i];
+            assertTrue( "object class " + name + " is NOT present when it should be!", ocls.contains( name ) );
+        }
+    }
+
+
+    /**
+     * This is the original defect as in JIRA DIREVE-216.
+     * 
+     * @throws NamingException
+     */
+    public void testAddObjectClasses() throws NamingException
+    {
+
+        // modify object classes, add two more
+        Attributes attributes = new BasicAttributes( true );
+        Attribute ocls = new BasicAttribute( "objectClass" );
+        ocls.add( "organizationalPerson" );
+        ocls.add( "inetOrgPerson" );
+        attributes.put( ocls );
+
+        DirContext person = ( DirContext ) ctx.lookup( RDN );
+        person.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, attributes );
+
+        // Read again from directory
+        person = ( DirContext ) ctx.lookup( RDN );
+        attributes = person.getAttributes( "" );
+        Attribute newOcls = attributes.get( "objectClass" );
+
+        String[] expectedOcls =
+            { "top", "person", "organizationalPerson", "inetOrgPerson" };
+        for ( int i = 0; i < expectedOcls.length; i++ )
+        {
+            String name = expectedOcls[i];
+            assertTrue( "object class " + name + " is present", newOcls.contains( name ) );
+        }
+    }
+
+
+    /**
+     * This changes a single attribute value. Just as a reference.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyDescription() throws NamingException
+    {
+        String newDescription = "More info on the user ...";
+
+        // modify object classes, add two more
+        Attributes attributes = new BasicAttributes( true );
+        Attribute desc = new BasicAttribute( "description", newDescription );
+        attributes.put( desc );
+
+        DirContext person = ( DirContext ) ctx.lookup( RDN );
+        person.modifyAttributes( "", DirContext.REPLACE_ATTRIBUTE, attributes );
+
+        // Read again from directory
+        person = ( DirContext ) ctx.lookup( RDN );
+        attributes = person.getAttributes( "" );
+        Attribute newDesc = attributes.get( "description" );
+
+        assertTrue( "new Description", newDesc.contains( newDescription ) );
+    }
+}

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/AddObjectClassesToEntryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/AddObjectClassesToEntryTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/BadDnTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/BadDnTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MatchingRuleCompareTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MatchingRuleCompareTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java?rev=377135&r1=377134&r2=377135&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java Sat Feb 11 21:50:03 2006
@@ -41,7 +41,7 @@
  * A set of miscellanous tests.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 375632 $
+ * @version $Rev$
  */
 public class MiscTest extends AbstractServerTest
 {

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java?rev=377135&r1=377134&r2=377135&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java Sat Feb 11 21:50:03 2006
@@ -1,299 +1,299 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   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.directory.server;
-
-
-import java.util.Hashtable;
-
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-
-import org.apache.directory.server.unit.AbstractServerTest;
-
-
-/**
- * Testcase with different modify DN operations on a person entry.
- * Originally created to demonstrate DIREVE-173.
- * 
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class ModifyRdnTest extends AbstractServerTest
-{
-
-    private LdapContext ctx = null;
-
-
-    /**
-     * Create attributes for a person entry.
-     */
-    protected Attributes getPersonAttributes( String sn, String cn )
-    {
-        Attributes attributes = new BasicAttributes();
-        Attribute attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "person" );
-        attributes.put( attribute );
-        attributes.put( "cn", cn );
-        attributes.put( "sn", sn );
-        attributes.put( "description", cn + " is a person." );
-
-        return attributes;
-    }
-
-
-    /**
-     * Create context
-     */
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        Hashtable env = new Hashtable();
-        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
-        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
-        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
-        env.put( "java.naming.security.credentials", "secret" );
-        env.put( "java.naming.security.authentication", "simple" );
-        ctx = new InitialLdapContext( env, null );
-        assertNotNull( ctx );
-    }
-
-
-    /**
-     * Close context
-     */
-    public void tearDown() throws Exception
-    {
-        ctx.close();
-        ctx = null;
-
-        super.tearDown();
-    }
-
-
-    /**
-     * Just a little test to check wether opening the connection succeeds.
-     */
-    public void testSetUpTearDown() throws NamingException
-    {
-        assertNotNull( ctx );
-    }
-
-
-    /**
-     * Modify Rdn of an entry, delete its old rdn value.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnAndDeleteOld() throws NamingException
-    {
-        // Create a person, cn value is rdn
-        String oldCn = "Myra Ellen Amos";
-        String oldRdn = "cn=" + oldCn;
-        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
-        ctx.createSubcontext( oldRdn, attributes );
-
-        // modify Rdn
-        String newCn = "Tori Amos";
-        String newRdn = "cn=" + newCn;
-        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "true" );
-        ctx.rename( oldRdn, newRdn );
-
-        // Check, whether old Entry does not exists
-        try
-        {
-            ctx.lookup( oldRdn );
-            fail( "Entry must not exist" );
-        }
-        catch ( NameNotFoundException ignored )
-        {
-            // expected behaviour
-            assertTrue( true );
-        }
-
-        // Check, whether new Entry exists
-        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
-        assertNotNull( tori );
-
-        // Check values of cn
-        Attribute cn = tori.getAttributes( "" ).get( "cn" );
-        assertTrue( cn.contains( newCn ) );
-        assertTrue( !cn.contains( oldCn ) ); // old value is gone
-        assertEquals( 1, cn.size() );
-
-        // Remove entry (use new rdn)
-        ctx.unbind( newRdn );
-    }
-
-
-    /**
-     * Modify Rdn of an entry, keep its old rdn value.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnAndKeepOld() throws NamingException
-    {
-        // Create a person, cn value is rdn
-        String oldCn = "Myra Ellen Amos";
-        String oldRdn = "cn=" + oldCn;
-        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
-        ctx.createSubcontext( oldRdn, attributes );
-
-        // modify Rdn
-        String newCn = "Tori Amos";
-        String newRdn = "cn=" + newCn;
-        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
-        ctx.rename( oldRdn, newRdn );
-
-        // Check, whether old entry does not exist
-        try
-        {
-            ctx.lookup( oldRdn );
-            fail( "Entry must not exist" );
-        }
-        catch ( NameNotFoundException ignored )
-        {
-            // expected behaviour
-            assertTrue( true );
-        }
-
-        // Check, whether new entry exists
-        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
-        assertNotNull( tori );
-
-        // Check values of cn
-        Attribute cn = tori.getAttributes( "" ).get( "cn" );
-        assertTrue( cn.contains( newCn ) );
-        assertTrue( cn.contains( oldCn ) ); // old value is still there
-        assertEquals( 2, cn.size() );
-
-        // Remove entry (use new rdn)
-        ctx.unbind( newRdn );
-    }
-
-
-    /**
-     * Modify Rdn of an entry, delete its old rdn value. Here, the rdn attribute
-     * cn has another value as well.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnAndDeleteOldVariant() throws NamingException
-    {
-        // Create a person, cn value is rdn
-        String oldCn = "Myra Ellen Amos";
-        String oldRdn = "cn=" + oldCn;
-        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
-
-        // add a second cn value
-        String alternateCn = "Myra E. Amos";
-        Attribute cn = attributes.get( "cn" );
-        cn.add( alternateCn );
-        assertEquals( 2, cn.size() );
-
-        ctx.createSubcontext( oldRdn, attributes );
-
-        // modify Rdn
-        String newCn = "Tori Amos";
-        String newRdn = "cn=" + newCn;
-        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "true" );
-        ctx.rename( oldRdn, newRdn );
-
-        // Check, whether old Entry does not exist anymore
-        try
-        {
-            ctx.lookup( oldRdn );
-            fail( "Entry must not exist" );
-        }
-        catch ( NameNotFoundException ignored )
-        {
-            // expected behaviour
-            assertTrue( true );
-        }
-
-        // Check, whether new Entry exists
-        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
-        assertNotNull( tori );
-
-        // Check values of cn
-        cn = tori.getAttributes( "" ).get( "cn" );
-        assertTrue( cn.contains( newCn ) );
-        assertTrue( !cn.contains( oldCn ) ); // old value is gone
-        assertTrue( cn.contains( alternateCn ) ); // alternate value is still available
-        assertEquals( 2, cn.size() );
-
-        // Remove entry (use new rdn)
-        ctx.unbind( newRdn );
-    }
-
-
-    /**
-     * Modify DN of an entry, changing RDN from cn to sn.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnDifferentAttribute() throws NamingException
-    {
-
-        // Create a person, cn value is rdn
-        String cnVal = "Tori Amos";
-        String snVal = "Amos";
-        String oldRdn = "cn=" + cnVal;
-        Attributes attributes = this.getPersonAttributes( snVal, cnVal );
-        ctx.createSubcontext( oldRdn, attributes );
-
-        // modify Rdn from cn=... to sn=...
-        String newRdn = "sn=" + snVal;
-        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
-        ctx.rename( oldRdn, newRdn );
-
-        // Check, whether old Entry does not exists
-        try
-        {
-            ctx.lookup( oldRdn );
-            fail( "Entry must not exist" );
-        }
-        catch ( NameNotFoundException ignored )
-        {
-            // expected behaviour
-        }
-
-        // Check, whether new Entry exists
-        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
-        assertNotNull( tori );
-
-        // Check values of cn and sn
-        // especially the number of cn and sn occurences
-        Attribute cn = tori.getAttributes( "" ).get( "cn" );
-        assertTrue( cn.contains( cnVal ) );
-        assertEquals( "Number of cn occurences", 1, cn.size() );
-        Attribute sn = tori.getAttributes( "" ).get( "sn" );
-        assertTrue( sn.contains( snVal ) );
-        assertEquals( "Number of sn occurences", 1, sn.size() );
-
-        // Remove entry (use new rdn)
-        ctx.unbind( newRdn );
-    }
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   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.directory.server;
+
+
+import java.util.Hashtable;
+
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+
+import org.apache.directory.server.unit.AbstractServerTest;
+
+
+/**
+ * Testcase with different modify DN operations on a person entry.
+ * Originally created to demonstrate DIREVE-173.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class ModifyRdnTest extends AbstractServerTest
+{
+
+    private LdapContext ctx = null;
+
+
+    /**
+     * Create attributes for a person entry.
+     */
+    protected Attributes getPersonAttributes( String sn, String cn )
+    {
+        Attributes attributes = new BasicAttributes();
+        Attribute attribute = new BasicAttribute( "objectClass" );
+        attribute.add( "top" );
+        attribute.add( "person" );
+        attributes.put( attribute );
+        attributes.put( "cn", cn );
+        attributes.put( "sn", sn );
+        attributes.put( "description", cn + " is a person." );
+
+        return attributes;
+    }
+
+
+    /**
+     * Create context
+     */
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        Hashtable env = new Hashtable();
+        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
+        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.credentials", "secret" );
+        env.put( "java.naming.security.authentication", "simple" );
+        ctx = new InitialLdapContext( env, null );
+        assertNotNull( ctx );
+    }
+
+
+    /**
+     * Close context
+     */
+    public void tearDown() throws Exception
+    {
+        ctx.close();
+        ctx = null;
+
+        super.tearDown();
+    }
+
+
+    /**
+     * Just a little test to check wether opening the connection succeeds.
+     */
+    public void testSetUpTearDown() throws NamingException
+    {
+        assertNotNull( ctx );
+    }
+
+
+    /**
+     * Modify Rdn of an entry, delete its old rdn value.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnAndDeleteOld() throws NamingException
+    {
+        // Create a person, cn value is rdn
+        String oldCn = "Myra Ellen Amos";
+        String oldRdn = "cn=" + oldCn;
+        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn
+        String newCn = "Tori Amos";
+        String newRdn = "cn=" + newCn;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "true" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old Entry does not exists
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+            assertTrue( true );
+        }
+
+        // Check, whether new Entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn
+        Attribute cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( newCn ) );
+        assertTrue( !cn.contains( oldCn ) ); // old value is gone
+        assertEquals( 1, cn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+
+
+    /**
+     * Modify Rdn of an entry, keep its old rdn value.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnAndKeepOld() throws NamingException
+    {
+        // Create a person, cn value is rdn
+        String oldCn = "Myra Ellen Amos";
+        String oldRdn = "cn=" + oldCn;
+        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn
+        String newCn = "Tori Amos";
+        String newRdn = "cn=" + newCn;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old entry does not exist
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+            assertTrue( true );
+        }
+
+        // Check, whether new entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn
+        Attribute cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( newCn ) );
+        assertTrue( cn.contains( oldCn ) ); // old value is still there
+        assertEquals( 2, cn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+
+
+    /**
+     * Modify Rdn of an entry, delete its old rdn value. Here, the rdn attribute
+     * cn has another value as well.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnAndDeleteOldVariant() throws NamingException
+    {
+        // Create a person, cn value is rdn
+        String oldCn = "Myra Ellen Amos";
+        String oldRdn = "cn=" + oldCn;
+        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
+
+        // add a second cn value
+        String alternateCn = "Myra E. Amos";
+        Attribute cn = attributes.get( "cn" );
+        cn.add( alternateCn );
+        assertEquals( 2, cn.size() );
+
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn
+        String newCn = "Tori Amos";
+        String newRdn = "cn=" + newCn;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "true" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old Entry does not exist anymore
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+            assertTrue( true );
+        }
+
+        // Check, whether new Entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn
+        cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( newCn ) );
+        assertTrue( !cn.contains( oldCn ) ); // old value is gone
+        assertTrue( cn.contains( alternateCn ) ); // alternate value is still available
+        assertEquals( 2, cn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+
+
+    /**
+     * Modify DN of an entry, changing RDN from cn to sn.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnDifferentAttribute() throws NamingException
+    {
+
+        // Create a person, cn value is rdn
+        String cnVal = "Tori Amos";
+        String snVal = "Amos";
+        String oldRdn = "cn=" + cnVal;
+        Attributes attributes = this.getPersonAttributes( snVal, cnVal );
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn from cn=... to sn=...
+        String newRdn = "sn=" + snVal;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old Entry does not exists
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+        }
+
+        // Check, whether new Entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn and sn
+        // especially the number of cn and sn occurences
+        Attribute cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( cnVal ) );
+        assertEquals( "Number of cn occurences", 1, cn.size() );
+        Attribute sn = tori.getAttributes( "" ).get( "sn" );
+        assertTrue( sn.contains( snVal ) );
+        assertEquals( "Number of sn occurences", 1, sn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+}

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/UnknownExtendedOperationTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/UnknownExtendedOperationTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSClient.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSClient.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSClientApplet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSClientApplet.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSServer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSServer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSServerThread.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/examples/gssdemo/GSSServerThread.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/keytab/KeytabEntry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/keytab/KeytabEntry.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/keytab/KeytabException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/keytab/KeytabException.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/keytab/KeytabStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/rc1/clients/kerberos/examples/src/java/org/apache/kerberos/keytab/KeytabStore.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Feb 11 21:50:03 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

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

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

Propchange: directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/DelOpts.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/LdapAdd.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapAdd.java?rev=377135&r1=377134&r2=377135&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapAdd.java (original)
+++ directory/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapAdd.java Sat Feb 11 21:50:03 2006
@@ -1,446 +1,446 @@
-/*
- *                                 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 javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
-
-import org.apache.ldap.common.ldif.LdifParser;
-import org.apache.ldap.common.ldif.LdifParserImpl;
-import org.apache.ldap.common.message.AddRequest;
-import org.apache.ldap.common.message.AddRequestImpl;
-import org.apache.ldap.common.message.AddResponse;
-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.ResultCodeEnum;
-
-/**
- * Ldap client for the ADD operation
- * 
- * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
- * @author $Author: jmachols $
- * @version $Revision$
- */
-public class LdapAdd extends LdapBind
-{
-    /**
-     * Create the instance of the add client and parse the command line
-     * arguments
-     * 
-     * @param args
-     *            Command line arguments
-     */
-    public LdapAdd( 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()
-    {
-        AddOpts opts = (AddOpts) 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 stream
-     *            The input stream to read the LDIF entries from
-     */
-    public void parseInput( InputStream inputStream )
-    {
-        String line = new String();
-        StringBuffer buf = new StringBuffer();
-        int messageNum = 2;
-        BufferedReader stream = new BufferedReader( new InputStreamReader( inputStream ) );
-        try
-        {
-            while( (line = stream.readLine()) != null )
-            {
-                if( line.startsWith( "#" ) )
-                {
-                    continue;
-                }
-
-                if( line.trim().equals( "" ) )
-                {
-                    add( buf, messageNum );
-                    messageNum++;
-                    buf.setLength( 0 );
-                    continue;
-                }
-
-                buf.append( line );
-                buf.append( '\n' );
-            }
-        }
-        catch( IOException e )
-        {
-            getLog().error( "error reading from input " + e.toString() );
-            System.exit( -1 );
-        }
-
-        add( 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 msgId
-     *            message id number
-     */
-    public void add( StringBuffer buf, int msgId )
-    {
-        AddRequest request = new AddRequestImpl( msgId );
-        try
-        {
-            // ------------------------------------------
-            // We need to change this to lockableAttribute
-            // but that impl needs some work first
-            //-------------------------------------------
-            String dn = new String();
-            LdifParser parser = new LdifParserImpl();
-            Attributes attributes = new BasicAttributes();
-            parser.parse( attributes, buf.toString() );
-            Attribute attr = attributes.get( "dn" );
-
-            if( attr == null )
-            {
-                return;
-            }
-
-            dn = (String) attr.get();
-            request.setEntry( dn );
-            attributes.remove( "dn" );
-            request.setAttributes( attributes );
-        }
-        catch( NamingException ne )
-        {
-            System.out.println( "Error parsing file " + ne.toString() );
-            System.exit( -1 );
-        }
-
-        super.getEncoder().encodeBlocking( null, super.getOut(), request );
-        AddResponse l_addResponse = (AddResponse) super.getDecoder().decode( null, super.getIn() );
-        LdapResult l_result = l_addResponse.getLdapResult();
-
-        if( l_result.getResultCode() == ResultCodeEnum.SUCCESS )
-        {
-            getLog().info( "Add of Entry " + request.getEntry() + " was successful" );
-        }
-        else
-        {
-            getLog().error(
-                    "Add of entry " + request.getEntry() + " failed for the following reasons provided by the server:\n"
-                            + new String( l_result.getErrorMessage() ) );
-        }
-    }
-
-    /**
-     * The main method of the Modify client.
-     * 
-     * @param a_args
-     *            Command line arguments
-     */
-    public static void main( String[] args )
-    {
-        LdapAdd client = new LdapAdd( 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 javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttributes;
+
+import org.apache.ldap.common.ldif.LdifParser;
+import org.apache.ldap.common.ldif.LdifParserImpl;
+import org.apache.ldap.common.message.AddRequest;
+import org.apache.ldap.common.message.AddRequestImpl;
+import org.apache.ldap.common.message.AddResponse;
+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.ResultCodeEnum;
+
+/**
+ * Ldap client for the ADD operation
+ * 
+ * @author <a href="mailto:jmachols@comcast.net">Jeff Machols </a>
+ * @author $Author: jmachols $
+ * @version $Revision$
+ */
+public class LdapAdd extends LdapBind
+{
+    /**
+     * Create the instance of the add client and parse the command line
+     * arguments
+     * 
+     * @param args
+     *            Command line arguments
+     */
+    public LdapAdd( 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()
+    {
+        AddOpts opts = (AddOpts) 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 stream
+     *            The input stream to read the LDIF entries from
+     */
+    public void parseInput( InputStream inputStream )
+    {
+        String line = new String();
+        StringBuffer buf = new StringBuffer();
+        int messageNum = 2;
+        BufferedReader stream = new BufferedReader( new InputStreamReader( inputStream ) );
+        try
+        {
+            while( (line = stream.readLine()) != null )
+            {
+                if( line.startsWith( "#" ) )
+                {
+                    continue;
+                }
+
+                if( line.trim().equals( "" ) )
+                {
+                    add( buf, messageNum );
+                    messageNum++;
+                    buf.setLength( 0 );
+                    continue;
+                }
+
+                buf.append( line );
+                buf.append( '\n' );
+            }
+        }
+        catch( IOException e )
+        {
+            getLog().error( "error reading from input " + e.toString() );
+            System.exit( -1 );
+        }
+
+        add( 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 msgId
+     *            message id number
+     */
+    public void add( StringBuffer buf, int msgId )
+    {
+        AddRequest request = new AddRequestImpl( msgId );
+        try
+        {
+            // ------------------------------------------
+            // We need to change this to lockableAttribute
+            // but that impl needs some work first
+            //-------------------------------------------
+            String dn = new String();
+            LdifParser parser = new LdifParserImpl();
+            Attributes attributes = new BasicAttributes();
+            parser.parse( attributes, buf.toString() );
+            Attribute attr = attributes.get( "dn" );
+
+            if( attr == null )
+            {
+                return;
+            }
+
+            dn = (String) attr.get();
+            request.setEntry( dn );
+            attributes.remove( "dn" );
+            request.setAttributes( attributes );
+        }
+        catch( NamingException ne )
+        {
+            System.out.println( "Error parsing file " + ne.toString() );
+            System.exit( -1 );
+        }
+
+        super.getEncoder().encodeBlocking( null, super.getOut(), request );
+        AddResponse l_addResponse = (AddResponse) super.getDecoder().decode( null, super.getIn() );
+        LdapResult l_result = l_addResponse.getLdapResult();
+
+        if( l_result.getResultCode() == ResultCodeEnum.SUCCESS )
+        {
+            getLog().info( "Add of Entry " + request.getEntry() + " was successful" );
+        }
+        else
+        {
+            getLog().error(
+                    "Add of entry " + request.getEntry() + " failed for the following reasons provided by the server:\n"
+                            + new String( l_result.getErrorMessage() ) );
+        }
+    }
+
+    /**
+     * The main method of the Modify client.
+     * 
+     * @param a_args
+     *            Command line arguments
+     */
+    public static void main( String[] args )
+    {
+        LdapAdd client = new LdapAdd( 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/sandbox/akarasulu/rc1/clients/ldap/src/main/java/org/apache/ldap/clients/LdapAdd.java
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message