From a2087122f6404c6eceaffdc49253f333862a48e1 Mon Sep 17 00:00:00 2001 From: Stef Date: Thu, 29 Apr 2004 23:37:45 +0000 Subject: Imported into eclipse --- src/com/memberwebs/ldapxml/LXReader.java | 45 +++++++++++++++------- src/com/memberwebs/ldapxml/LXSpecs.java | 5 +-- .../memberwebs/ldapxml/helpers/LXAttribute.java | 4 -- src/com/memberwebs/ldapxml/helpers/LXBase.java | 6 +-- src/com/memberwebs/ldapxml/helpers/LXClass.java | 4 -- src/com/memberwebs/ldapxml/helpers/LXEntry.java | 4 -- src/com/memberwebs/ldapxml/helpers/LXRoot.java | 4 -- 7 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/com/memberwebs/ldapxml/LXReader.java b/src/com/memberwebs/ldapxml/LXReader.java index 9477b5f..be32632 100644 --- a/src/com/memberwebs/ldapxml/LXReader.java +++ b/src/com/memberwebs/ldapxml/LXReader.java @@ -1,16 +1,33 @@ package com.memberwebs.ldapxml; -import java.io.*; -import java.util.*; - -import com.novell.ldap.*; -import org.apache.xerces.dom.*; -import org.apache.xerces.parsers.*; -import org.w3c.dom.*; - -import com.memberwebs.ldapxml.helpers.*; -import com.familymembers.util.ldap.*; -import com.familymembers.util.*; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Set; +import java.util.Vector; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import com.familymembers.util.StringUtil; +import com.familymembers.util.ldap.LDAPUtil; +import com.memberwebs.ldapxml.helpers.LXAttribute; +import com.memberwebs.ldapxml.helpers.LXBase; +import com.memberwebs.ldapxml.helpers.LXClass; +import com.memberwebs.ldapxml.helpers.LXDefaultConvert; +import com.memberwebs.ldapxml.helpers.LXDefaultHook; +import com.memberwebs.ldapxml.helpers.LXEntry; +import com.memberwebs.ldapxml.helpers.LXRoot; +import com.novell.ldap.LDAPAttribute; +import com.novell.ldap.LDAPAttributeSchema; +import com.novell.ldap.LDAPCompareAttrNames; +import com.novell.ldap.LDAPConnection; +import com.novell.ldap.LDAPEntry; +import com.novell.ldap.LDAPException; +import com.novell.ldap.LDAPObjectClassSchema; +import com.novell.ldap.LDAPSchema; +import com.novell.ldap.LDAPSearchConstraints; +import com.novell.ldap.LDAPSearchResults; /** * Uses an LX map to read data from an LDAP directory, returning @@ -151,7 +168,7 @@ public class LXReader cons.setMaxResults(last + 1); // Search tree for entries - LDAPSearchResults results = m_connection.search(base, m_connection.SCOPE_SUB, + LDAPSearchResults results = m_connection.search(base, LDAPConnection.SCOPE_SUB, specs.getFilter(filter), attrs, false, cons); if(sort != null) @@ -259,7 +276,7 @@ public class LXReader // Get the entry LDAPSearchResults results = m_connection.search(dn, - m_connection.SCOPE_BASE, specs.getFilter(), attrs, false); + LDAPConnection.SCOPE_BASE, specs.getFilter(), attrs, false); Element el = null; @@ -580,7 +597,7 @@ public class LXReader { // Get everything at one level down LDAPSearchResults results = m_connection.search(dn, - m_connection.SCOPE_ONE, specs.getFilter(), attrs, false); + LDAPConnection.SCOPE_ONE, specs.getFilter(), attrs, false); String[] sort = specs.getMappedSort(m_map); if(sort != null) diff --git a/src/com/memberwebs/ldapxml/LXSpecs.java b/src/com/memberwebs/ldapxml/LXSpecs.java index 98f1d55..ed342ea 100644 --- a/src/com/memberwebs/ldapxml/LXSpecs.java +++ b/src/com/memberwebs/ldapxml/LXSpecs.java @@ -1,9 +1,8 @@ package com.memberwebs.ldapxml; -import java.util.*; +import java.util.Map; -import com.memberwebs.ldapxml.helpers.*; -import com.familymembers.util.ldap.*; +import com.familymembers.util.ldap.LDAPUtil; /** * Additional specifications for retrieving data from an diff --git a/src/com/memberwebs/ldapxml/helpers/LXAttribute.java b/src/com/memberwebs/ldapxml/helpers/LXAttribute.java index 1e75da5..1ba46b5 100644 --- a/src/com/memberwebs/ldapxml/helpers/LXAttribute.java +++ b/src/com/memberwebs/ldapxml/helpers/LXAttribute.java @@ -1,9 +1,5 @@ package com.memberwebs.ldapxml.helpers; -import java.io.*; -import java.util.*; - -import org.w3c.dom.*; /** * Represents an <attribute> or <element> in an LX map. diff --git a/src/com/memberwebs/ldapxml/helpers/LXBase.java b/src/com/memberwebs/ldapxml/helpers/LXBase.java index 2a42c35..834336e 100644 --- a/src/com/memberwebs/ldapxml/helpers/LXBase.java +++ b/src/com/memberwebs/ldapxml/helpers/LXBase.java @@ -1,9 +1,7 @@ package com.memberwebs.ldapxml.helpers; -import java.io.*; -import java.util.*; - -import org.w3c.dom.*; +import java.util.Enumeration; +import java.util.Hashtable; /** * A base class for all objects in an LX map tree. diff --git a/src/com/memberwebs/ldapxml/helpers/LXClass.java b/src/com/memberwebs/ldapxml/helpers/LXClass.java index a88dba1..0d86cc4 100644 --- a/src/com/memberwebs/ldapxml/helpers/LXClass.java +++ b/src/com/memberwebs/ldapxml/helpers/LXClass.java @@ -1,9 +1,5 @@ package com.memberwebs.ldapxml.helpers; -import java.io.*; -import java.util.*; - -import org.w3c.dom.*; /** * Represents a <class> in an LX map. diff --git a/src/com/memberwebs/ldapxml/helpers/LXEntry.java b/src/com/memberwebs/ldapxml/helpers/LXEntry.java index 28722ef..52b795a 100644 --- a/src/com/memberwebs/ldapxml/helpers/LXEntry.java +++ b/src/com/memberwebs/ldapxml/helpers/LXEntry.java @@ -1,9 +1,5 @@ package com.memberwebs.ldapxml.helpers; -import java.io.*; -import java.util.*; - -import org.w3c.dom.*; /** * Represents an <entry> object in an LX map. diff --git a/src/com/memberwebs/ldapxml/helpers/LXRoot.java b/src/com/memberwebs/ldapxml/helpers/LXRoot.java index 057671c..3dce33c 100644 --- a/src/com/memberwebs/ldapxml/helpers/LXRoot.java +++ b/src/com/memberwebs/ldapxml/helpers/LXRoot.java @@ -1,9 +1,5 @@ package com.memberwebs.ldapxml.helpers; -import java.io.*; -import java.util.*; - -import org.w3c.dom.*; /** * Represents the root of an LX map -- cgit v1.2.3