svn commit: r741565 - /directory/sandbox/szoerner/groovyldap/src/main/java/org/apache/directory/groovyldap/LDAP.java

[sz...@apache.org]

Author: szoerner
Date: Fri Feb  6 13:45:17 2009
New Revision: 741565

URL: http://svn.apache.org/viewvc?rev=741565&view=rev
Log:
Applied Michals changes

Modified:
    directory/sandbox/szoerner/groovyldap/src/main/java/org/apache/directory/groovyldap/LDAP.java

Modified: directory/sandbox/szoerner/groovyldap/src/main/java/org/apache/directory/groovyldap/LDAP.java
URL: http://svn.apache.org/viewvc/directory/sandbox/szoerner/groovyldap/src/main/java/org/apache/directory/groovyldap/LDAP.java?rev=741565&r1=741564&r2=741565&view=diff
==============================================================================
--- directory/sandbox/szoerner/groovyldap/src/main/java/org/apache/directory/groovyldap/LDAP.java (original)
+++ directory/sandbox/szoerner/groovyldap/src/main/java/org/apache/directory/groovyldap/LDAP.java Fri Feb  6 13:45:17 2009
@@ -33,8 +33,6 @@
 import javax.naming.NamingEnumeration;
 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.ModificationItem;
 import javax.naming.directory.SearchControls;
@@ -63,7 +61,6 @@
     private String bindUser;
 
     private String bindPassword;
-    private String baseDn;
 
 
     protected Properties createEnvironment()
@@ -94,13 +91,6 @@
     }
 
 
-    protected LDAP( String url, String baseDn )
-    {
-        this.url = url;
-        this.anonymousBind = true;
-        this.baseDn = baseDn;
-    }
-
     protected LDAP( String url, String bindUser, String bindPassword )
     {
         this.url = url;
@@ -109,15 +99,6 @@
         this.bindPassword = bindPassword;
     }
 
-    protected LDAP( String url, String baseDn, String bindUser, String bindPassword )
-    {
-        this.url = url;
-        this.anonymousBind = false;
-        this.baseDn = baseDn;
-        this.bindUser = bindUser;
-        this.bindPassword = bindPassword;
-    }
-
     /**
      * Creates a new LDAP object with default parameters. It will anonymously connect to localhost on port 389. 
      */
@@ -131,21 +112,11 @@
         return new LDAP( url );
     }
 
-    public static LDAP newInstance( String url, String baseDn )
-    {
-        return new LDAP( url, baseDn );
-    }
-
     public static LDAP newInstance( String url, String bindUser, String bindPassword )
     {
         return new LDAP( url, bindUser, bindPassword );
     }
 
-    public static LDAP newInstance( String url, String baseDn, String bindUser, String bindPassword )
-    {
-        return new LDAP( url, baseDn, bindUser, bindPassword );
-    }
-
 
     /**
      * Search scope ONE (one level)
@@ -431,7 +402,7 @@
 
     public void eachEntry( String filter, Closure closure ) throws NamingException
     {
-        eachEntry( filter, baseDn, SearchScope.SUB, closure );
+        eachEntry( filter, "", SearchScope.SUB, closure );
     }
 
 
@@ -533,7 +504,7 @@
 
     public List<Object> search( String filter ) throws NamingException
     {
-        return search( filter, baseDn, SearchScope.SUB );
+        return search( filter, "", SearchScope.SUB );
     }
 
 
@@ -607,7 +578,7 @@
 
     public Object searchUnique( String filter) throws NamingException
     {
-        return searchUnique( filter, baseDn, SearchScope.SUB);
+        return searchUnique( filter, "", SearchScope.SUB);
     }