Commit a6229147 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gaston

Moved JiveGlobals to org.jivesoftware.util and made it more generic. JM-248


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1221 b35dd754-fafc-0310-a699-88a17e54d16e
parent bd412c1f
...@@ -12,17 +12,17 @@ ...@@ -12,17 +12,17 @@
package org.jivesoftware.messenger.ldap; package org.jivesoftware.messenger.ldap;
import org.jivesoftware.messenger.user.*; import org.jivesoftware.messenger.user.*;
import org.jivesoftware.messenger.JiveGlobals;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.JiveConstants; import org.jivesoftware.util.JiveConstants;
import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.Log;
import javax.naming.directory.*;
import javax.naming.NamingEnumeration; import javax.naming.NamingEnumeration;
import javax.naming.directory.*;
import javax.naming.ldap.Control; import javax.naming.ldap.Control;
import javax.naming.ldap.SortControl;
import javax.naming.ldap.LdapContext; import javax.naming.ldap.LdapContext;
import java.util.*; import javax.naming.ldap.SortControl;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.*;
/** /**
* LDAP implementation of the UserProvider interface. All data in the directory is * LDAP implementation of the UserProvider interface. All data in the directory is
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
org.jivesoftware.messenger.PresenceManager, org.jivesoftware.messenger.PresenceManager,
org.xmpp.packet.Presence, org.xmpp.packet.Presence,
java.net.URLEncoder, java.net.URLEncoder,
org.jivesoftware.messenger.JiveGlobals" org.jivesoftware.util.JiveGlobals"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment