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

Replaces references to org.jivesoftware.xmpp with org.jivesoftware.messenger


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@53 b35dd754-fafc-0310-a699-88a17e54d16e
parent ee106df0
......@@ -47,9 +47,9 @@ public class AuthProviderFactory {
* The default class to instantiate is database implementation.
*/
private static String authClassName =
"org.jivesoftware.xmpp.auth.spi.DbAuthProvider";
"org.jivesoftware.messenger.auth.spi.DbAuthProvider";
private static String groupClassName =
"org.jivesoftware.xmpp.auth.spi.DbGroupProvider";
"org.jivesoftware.messenger.auth.spi.DbGroupProvider";
private static AuthProvider authProvider = null;
private static GroupProvider groupProvider = null;
......
......@@ -416,8 +416,9 @@ public abstract class BootstrapContainer implements Container, ServiceLookupProv
public Object startService(Class service) throws UnauthorizedException {
Object instance = lookup.lookup(service);
if (instance == null) {
if (service.getName().equals("org.jivesoftware.xmpp.user.UserManager")) {
loadCorePlugins(new String[]{ "org.jivesoftware.xmpp.user.spi.UserManagerImpl"});
if (service.getName().equals("org.jivesoftware.messenger.user.UserManager")) {
loadCorePlugins(new String[]{
"org.jivesoftware.messenger.user.spi.UserManagerImpl"});
instance = lookup.lookup(service);
}
}
......
......@@ -36,6 +36,6 @@ public class XMPPServerStarter extends ServerStarter {
protected String getBootContainerClassName() {
return "org.jivesoftware.xmpp.XMPPBootContainer";
return "org.jivesoftware.messenger.XMPPBootContainer";
}
}
......@@ -50,11 +50,11 @@ public class UserProviderFactory {
/**
* The default class to instantiate is database implementation.
*/
private static String[] classNames = {"org.jivesoftware.xmpp.user.spi.DbUserIDProvider",
"org.jivesoftware.xmpp.user.spi.DbUserPropertiesProvider",
"org.jivesoftware.xmpp.user.spi.DbUserInfoProvider",
"org.jivesoftware.xmpp.user.spi.DbUserAccountProvider",
"org.jivesoftware.xmpp.user.spi.DbRosterItemProvider"};
private static String[] classNames = {"org.jivesoftware.messenger.user.spi.DbUserIDProvider",
"org.jivesoftware.messenger.user.spi.DbUserPropertiesProvider",
"org.jivesoftware.messenger.user.spi.DbUserInfoProvider",
"org.jivesoftware.messenger.user.spi.DbUserAccountProvider",
"org.jivesoftware.messenger.user.spi.DbRosterItemProvider"};
private static String[] propNames = {"UserProvider.id.className",
"UserProvider.properties.className",
......
......@@ -8,7 +8,7 @@
<%--
- This page is meant to be included in other pages. It assumes 2 variables:
- * 'sess', a org.jivesoftware.xmpp.Session object
- * 'sess', a org.jivesoftware.messenger.Session object
- * 'count', an int representing the row number we're on.
- * 'current', a boolean which indicates the current row the user is looking (pass in
- false if there is no current row.
......
......@@ -41,14 +41,14 @@
catch (ClassNotFoundException cnfe) {}
// Check that the Messenger jar are installed:
try {
loadClass("org.jivesoftware.xmpp.XMPPServer");
loadClass("org.jivesoftware.messenger.XMPPServer");
jiveJarsInstalled = true;
}
catch (ClassNotFoundException cnfe) {}
// Try to determine what the jiveHome directory is:
try {
Class jiveGlobalsClass = loadClass("org.jivesoftware.xmpp.JiveGlobals");
Class jiveGlobalsClass = loadClass("org.jivesoftware.messenger.JiveGlobals");
Method getJiveHomeMethod = jiveGlobalsClass.getMethod("getJiveHome", null);
String jiveHomeProp = (String)getJiveHomeMethod.invoke(jiveGlobalsClass, null);
if (jiveHomeProp != null) {
......
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