Index: src/com/octetstring/jdbcLdap/jndi/Delete.java =================================================================== RCS file: /repo/OpenLDAP/pkg/jdbcldap/src/com/octetstring/jdbcLdap/jndi/Delete.java,v retrieving revision 1.4 diff -u -d -p -r1.4 Delete.java --- src/com/octetstring/jdbcLdap/jndi/Delete.java 26 Jan 2005 23:10:17 -0000 1.4 +++ src/com/octetstring/jdbcLdap/jndi/Delete.java 24 Apr 2006 23:34:00 -0000 @@ -54,9 +54,9 @@ public class Delete { else { try { - LDAPSearchResults enum = res.searchUpInsJldap(del); - while (enum.hasMore()) { - LDAPEntry entry = enum.next(); + LDAPSearchResults enu = res.searchUpInsJldap(del); + while (enu.hasMore()) { + LDAPEntry entry = enu.next(); con.delete(entry.getDN()); count++; } Index: src/com/octetstring/jdbcLdap/jndi/Update.java =================================================================== RCS file: /repo/OpenLDAP/pkg/jdbcldap/src/com/octetstring/jdbcLdap/jndi/Update.java,v retrieving revision 1.5 diff -u -d -p -r1.5 Update.java --- src/com/octetstring/jdbcLdap/jndi/Update.java 26 Jan 2005 23:10:17 -0000 1.5 +++ src/com/octetstring/jdbcLdap/jndi/Update.java 24 Apr 2006 23:34:01 -0000 @@ -53,10 +53,10 @@ public class Update { try { if (update.getSearchScope() != 0) { - LDAPSearchResults enum = res.searchUpInsJldap(update); - //System.out.println("enum.hasMore : " + enum.hasMore()); - while (enum.hasMore()) { - seres = enum.next(); + LDAPSearchResults enu = res.searchUpInsJldap(update); + //System.out.println("enu.hasMore : " + enu.hasMore()); + while (enu.hasMore()) { + seres = enu.next(); buf.setLength(0); name = seres.getDN(); Index: src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java =================================================================== RCS file: /repo/OpenLDAP/pkg/jdbcldap/src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java,v retrieving revision 1.2 diff -u -d -p -r1.2 UpdateEntry.java --- src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java 26 Jan 2005 23:10:17 -0000 1.2 +++ src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java 24 Apr 2006 23:34:01 -0000 @@ -112,9 +112,9 @@ public class UpdateEntry { try { int count = 0; if (stmt.getSearchScope() != 0) { - LDAPSearchResults enum = res.searchUpInsJldap(stmt); - while (enum.hasMore()) { - entry = enum.next(); + LDAPSearchResults enu = res.searchUpInsJldap(stmt); + while (enu.hasMore()) { + entry = enu.next(); buf.setLength(0); name = entry.getDN(); Index: src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java =================================================================== RCS file: /repo/OpenLDAP/pkg/jdbcldap/src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java,v retrieving revision 1.5 diff -u -d -p -r1.5 TestResultSet.java --- src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java 21 Jun 2005 02:30:29 -0000 1.5 +++ src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java 24 Apr 2006 23:34:02 -0000 @@ -65,10 +65,10 @@ public class TestResultSet extends junit String field; - LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); + LDAPMessageQueue enu = (LDAPMessageQueue) sel.executeQuery(); UnpackResults pack = new UnpackResults(con); - pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap()); + pack.unpackJldap(enu,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap()); LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext()); @@ -135,10 +135,10 @@ public class TestResultSet extends junit String field; StringBuffer buf = new StringBuffer(); - LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); + LDAPMessageQueue enu = (LDAPMessageQueue) sel.executeQuery(); UnpackResults pack = new UnpackResults(con); - pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap()); + pack.unpackJldap(enu,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap()); LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext()); Index: src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java =================================================================== RCS file: /repo/OpenLDAP/pkg/jdbcldap/src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java,v retrieving revision 1.4 diff -u -d -p -r1.4 TestSelectRetrieve.java --- src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java 26 Jan 2005 23:10:17 -0000 1.4 +++ src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java 24 Apr 2006 23:34:03 -0000 @@ -213,9 +213,9 @@ public class TestSelectRetrieve extends /** *Loads a NamingEnumeration into a LinkedList - *@param enum Search Results + *@param enu Search Results */ - LinkedList load(NamingEnumeration enum) throws Exception { + LinkedList load(NamingEnumeration enu) throws Exception { LinkedList list = new LinkedList(); LinkedList row; SearchResult res; @@ -227,9 +227,9 @@ public class TestSelectRetrieve extends String val; Object obj; - while (enum.hasMore()) { + while (enu.hasMore()) { row = new LinkedList(); - res = (SearchResult) enum.next(); + res = (SearchResult) enu.next(); //System.out.println(res.getName()); atts = (Attributes) res.getAttributes(); Index: src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java =================================================================== RCS file: /repo/OpenLDAP/pkg/jdbcldap/src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java,v retrieving revision 1.5 diff -u -d -p -r1.5 TestUnpack.java --- src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java 21 Jun 2005 02:30:29 -0000 1.5 +++ src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java 24 Apr 2006 23:34:03 -0000 @@ -67,10 +67,10 @@ public class TestUnpack extends junit.fr - LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); + LDAPMessageQueue enu = (LDAPMessageQueue) sel.executeQuery(); UnpackResults pack = new UnpackResults(con); - pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); + pack.unpackJldap(enu,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); ArrayList fieldsExp = new ArrayList(); @@ -186,12 +186,12 @@ public class TestUnpack extends junit.fr String field; - LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); + LDAPMessageQueue enu = (LDAPMessageQueue) sel.executeQuery(); - System.out.println(enum); + System.out.println(enu); UnpackResults pack = new UnpackResults(con); - pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); + pack.unpackJldap(enu,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); ArrayList fieldsExp = new ArrayList(); @@ -263,10 +263,10 @@ public class TestUnpack extends junit.fr String field; - LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); + LDAPMessageQueue enu = (LDAPMessageQueue) sel.executeQuery(); UnpackResults pack = new UnpackResults(con); - pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); + pack.unpackJldap(enu,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); ArrayList fieldsExp = new ArrayList(); @@ -356,10 +356,10 @@ public class TestUnpack extends junit.fr String field; - LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); + LDAPMessageQueue enu = (LDAPMessageQueue) sel.executeQuery(); UnpackResults pack = new UnpackResults(con); - pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); + pack.unpackJldap(enu,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); ArrayList fieldsExp = new ArrayList(); @@ -470,11 +470,11 @@ public class TestUnpack extends junit.fr sel.getArgs()[0] = "Peons"; sel.getArgs()[1] = "A*"; - LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); - //if (! enum.hasMore()) System.out.println("no results"); + LDAPMessageQueue enu = (LDAPMessageQueue) sel.executeQuery(); + //if (! enu.hasMore()) System.out.println("no results"); UnpackResults pack = new UnpackResults(con); - pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); + pack.unpackJldap(enu,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null); ArrayList fieldsExp = new ArrayList();