Skip to content

O
Openfire
Commit 22159e5b authored by Dave Cridland's avatar Dave Cridland
Browse files
Options

Merge pull request #455 from guusdk/OF-1005 

OF-1005: Rolling back modules.xml
parents d62fe85c 407e081c
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 140 deletions
build/build.xml
View file @ 22159e5b
......@@ -1787,4 +1787,4 @@
</copy>
</target>
</project>
</project>
\ No newline at end of file
build/debian/openfire.conffiles
View file @ 22159e5b
/etc/openfire/openfire.xml
/etc/openfire/modules.xml
/etc/openfire/security.xml
/etc/openfire/security/keystore
/etc/openfire/security/truststore
......
build/installer/openfire.install4j
View file @ 22159e5b
......@@ -51,7 +51,6 @@
<fileEntry mountPoint="34" file="${compiler:RELEASE_FULL_PATH}/resources/security/truststore" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="34" file="${compiler:RELEASE_FULL_PATH}/resources/security/keystore" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="46" file="${compiler:RELEASE_FULL_PATH}/conf/openfire.xml" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="46" file="${compiler:RELEASE_FULL_PATH}/conf/modules.xml" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="46" file="${compiler:RELEASE_FULL_PATH}/conf/security.xml" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<fileEntry mountPoint="47" file="${compiler:RELEASE_FULL_PATH}/lib/log4j.xml" overwrite="0" shared="false" mode="644" uninstallMode="1" />
<dirEntry mountPoint="1" file="${compiler:RELEASE_FULL_PATH}" overwrite="4" shared="false" mode="644" uninstallMode="0" excludeSuffixes="" dirMode="755">
......
build/rpm/openfire.spec
View file @ 22159e5b
......@@ -112,7 +112,6 @@ exit 0
%{homedir}/bin/embedded-db-viewer.sh
%dir %{homedir}/conf
%config(noreplace) %{homedir}/conf/openfire.xml
%config(noreplace) %{homedir}/conf/modules.xml
%config(noreplace) %{homedir}/conf/security.xml
%config(noreplace) %{homedir}/conf/crowd.properties
%dir %{homedir}/lib
......
src/conf/modules.xml deleted 100644 → 0
View file @ d62fe85c
<?xml version="1.0" encoding="UTF-8"?>
<!--
This file stores the modules that make up the implementation of Openfire. Modules are loaded
in the order they are specified in this file (top to bottom).
Don't modify this file unless you really know what you are doing
-->
<jive>
<!-- Boot Modules -->
<module interface="org.jivesoftware.openfire.RoutingTable" implementation="org.jivesoftware.openfire.spi.RoutingTableImpl" />
<module interface="org.jivesoftware.openfire.audit.AuditManager" implementation="org.jivesoftware.openfire.audit.spi.AuditManagerImpl" />
<module interface="org.jivesoftware.openfire.roster.RosterManager" implementation="org.jivesoftware.openfire.roster.RosterManager" />
<module interface="org.jivesoftware.openfire.PrivateStorage" implementation="org.jivesoftware.openfire.PrivateStorage" />
<!-- Core Modules -->
<module interface="org.jivesoftware.openfire.PresenceManager" implementation="org.jivesoftware.openfire.spi.PresenceManagerImpl" />
<module interface="org.jivesoftware.openfire.SessionManager" implementation="org.jivesoftware.openfire.SessionManager" />
<module interface="org.jivesoftware.openfire.PacketRouter" implementation="org.jivesoftware.openfire.spi.PacketRouterImpl" />
<module interface="org.jivesoftware.openfire.IQRouter" implementation="org.jivesoftware.openfire.IQRouter" />
<module interface="org.jivesoftware.openfire.MessageRouter" implementation="org.jivesoftware.openfire.MessageRouter" />
<module interface="org.jivesoftware.openfire.PresenceRouter" implementation="org.jivesoftware.openfire.PresenceRouter" />
<module interface="org.jivesoftware.openfire.MulticastRouter" implementation="org.jivesoftware.openfire.MulticastRouter" />
<module interface="org.jivesoftware.openfire.spi.PacketTransporterImpl" implementation="org.jivesoftware.openfire.spi.PacketTransporterImpl" />
<module interface="org.jivesoftware.openfire.PacketDeliverer" implementation="org.jivesoftware.openfire.spi.PacketDelivererImpl" />
<module interface="org.jivesoftware.openfire.transport.TransportHandler" implementation="org.jivesoftware.openfire.transport.TransportHandler" />
<module interface="org.jivesoftware.openfire.OfflineMessageStrategy" implementation="org.jivesoftware.openfire.OfflineMessageStrategy" />
<module interface="org.jivesoftware.openfire.OfflineMessageStore" implementation="org.jivesoftware.openfire.OfflineMessageStore" />
<module interface="org.jivesoftware.openfire.vcard.VCardManager" implementation="org.jivesoftware.openfire.vcard.VCardManager" />
<module interface="org.jivesoftware.openfire.keystore.CertificateStoreManager" implementation="org.jivesoftware.openfire.keystore.CertificateStoreManager" />
<!-- Standard Modules -->
<module interface="org.jivesoftware.openfire.handler.IQBindHandler" implementation="org.jivesoftware.openfire.handler.IQBindHandler" />
<module interface="org.jivesoftware.openfire.handler.IQSessionEstablishmentHandler" implementation="org.jivesoftware.openfire.handler.IQSessionEstablishmentHandler" />
<module interface="org.jivesoftware.openfire.handler.IQAuthHandler" implementation="org.jivesoftware.openfire.handler.IQAuthHandler" />
<module interface="org.jivesoftware.openfire.handler.IQPingHandler" implementation="org.jivesoftware.openfire.handler.IQPingHandler" />
<module interface="org.jivesoftware.openfire.handler.IQPrivateHandler" implementation="org.jivesoftware.openfire.handler.IQPrivateHandler" />
<module interface="org.jivesoftware.openfire.handler.IQRegisterHandler" implementation="org.jivesoftware.openfire.handler.IQRegisterHandler" />
<module interface="org.jivesoftware.openfire.handler.IQRosterHandler" implementation="org.jivesoftware.openfire.handler.IQRosterHandler" />
<module interface="org.jivesoftware.openfire.handler.IQEntityTimeHandler" implementation="org.jivesoftware.openfire.handler.IQEntityTimeHandler" />
<module interface="org.jivesoftware.openfire.handler.IQvCardHandler" implementation="org.jivesoftware.openfire.handler.IQvCardHandler" />
<module interface="org.jivesoftware.openfire.handler.IQVersionHandler" implementation="org.jivesoftware.openfire.handler.IQVersionHandler" />
<module interface="org.jivesoftware.openfire.handler.IQLastActivityHandler" implementation="org.jivesoftware.openfire.handler.IQLastActivityHandler" />
<module interface="org.jivesoftware.openfire.handler.PresenceSubscribeHandler" implementation="org.jivesoftware.openfire.handler.PresenceSubscribeHandler" />
<module interface="org.jivesoftware.openfire.handler.PresenceUpdateHandler" implementation="org.jivesoftware.openfire.handler.PresenceUpdateHandler" />
<module interface="org.jivesoftware.openfire.handler.IQOfflineMessagesHandler" implementation="org.jivesoftware.openfire.handler.IQOfflineMessagesHandler" />
<module interface="org.jivesoftware.openfire.pep.IQPEPHandler" implementation="org.jivesoftware.openfire.pep.IQPEPHandler" />
<module interface="org.jivesoftware.openfire.pep.IQPEPOwnerHandler" implementation="org.jivesoftware.openfire.pep.IQPEPOwnerHandler" />
<module interface="org.jivesoftware.openfire.net.MulticastDNSService" implementation="org.jivesoftware.openfire.net.MulticastDNSService" />
<module interface="org.jivesoftware.openfire.handler.IQSharedGroupHandler" implementation="org.jivesoftware.openfire.handler.IQSharedGroupHandler" />
<module interface="org.jivesoftware.openfire.commands.AdHocCommandHandler" implementation="org.jivesoftware.openfire.commands.AdHocCommandHandler" />
<module interface="org.jivesoftware.openfire.handler.IQPrivacyHandler" implementation="org.jivesoftware.openfire.handler.IQPrivacyHandler" />
<module interface="org.jivesoftware.openfire.filetransfer.DefaultFileTransferManager" implementation="org.jivesoftware.openfire.filetransfer.DefaultFileTransferManager" />
<module interface="org.jivesoftware.openfire.filetransfer.proxy.FileTransferProxy" implementation="org.jivesoftware.openfire.filetransfer.proxy.FileTransferProxy" />
<module interface="org.jivesoftware.openfire.mediaproxy.MediaProxyService" implementation="org.jivesoftware.openfire.mediaproxy.MediaProxyService" />
<module interface="org.jivesoftware.openfire.pubsub.PubSubModule" implementation="org.jivesoftware.openfire.pubsub.PubSubModule" />
<module interface="org.jivesoftware.openfire.disco.IQDiscoInfoHandler" implementation="org.jivesoftware.openfire.disco.IQDiscoInfoHandler" />
<module interface="org.jivesoftware.openfire.disco.IQDiscoItemsHandler" implementation="org.jivesoftware.openfire.disco.IQDiscoItemsHandler" />
<module interface="org.jivesoftware.openfire.update.UpdateManager" implementation="org.jivesoftware.openfire.update.UpdateManager" />
<module interface="org.jivesoftware.openfire.FlashCrossDomainHandler" implementation="org.jivesoftware.openfire.FlashCrossDomainHandler" />
<module interface="org.jivesoftware.openfire.component.InternalComponentManager" implementation="org.jivesoftware.openfire.component.InternalComponentManager" />
<module interface="org.jivesoftware.openfire.muc.MultiUserChatManager" implementation="org.jivesoftware.openfire.muc.MultiUserChatManager" />
<module interface="org.jivesoftware.openfire.handler.IQMessageCarbonsHandler" implementation="org.jivesoftware.openfire.handler.IQMessageCarbonsHandler" />
<!--
Load this module always last since we don't want to start listening for clients
before the rest of the modules have been started
-->
<module interface="org.jivesoftware.openfire.ConnectionManager" implementation="org.jivesoftware.openfire.spi.ConnectionManagerImpl" />
</jive>
\ No newline at end of file
src/java/org/jivesoftware/openfire/XMPPServer.java
View file @ 22159e5b
......@@ -18,8 +18,6 @@
package org.jivesoftware.openfire;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.Node;
import org.dom4j.io.SAXReader;
import org.jivesoftware.database.DbConnectionManager;
import org.jivesoftware.openfire.admin.AdminManager;
......@@ -43,13 +41,14 @@ import org.jivesoftware.openfire.keystore.IdentityStore;
import org.jivesoftware.openfire.lockout.LockOutManager;
import org.jivesoftware.openfire.mediaproxy.MediaProxyService;
import org.jivesoftware.openfire.muc.MultiUserChatManager;
import org.jivesoftware.openfire.net.MulticastDNSService;
import org.jivesoftware.openfire.net.ServerTrafficCounter;
import org.jivesoftware.openfire.pep.IQPEPHandler;
import org.jivesoftware.openfire.pep.IQPEPOwnerHandler;
import org.jivesoftware.openfire.pubsub.PubSubModule;
import org.jivesoftware.openfire.roster.RosterManager;
import org.jivesoftware.openfire.session.RemoteSessionLocator;
import org.jivesoftware.openfire.spi.ConnectionType;
import org.jivesoftware.openfire.spi.XMPPServerInfoImpl;
import org.jivesoftware.openfire.spi.*;
import org.jivesoftware.openfire.transport.TransportHandler;
import org.jivesoftware.openfire.update.UpdateManager;
import org.jivesoftware.openfire.user.UserManager;
......@@ -119,7 +118,7 @@ public class XMPPServer {
/**
* All modules loaded by this server
*/
private Map<String, Module> modules = new LinkedHashMap<>();
private Map<Class, Module> modules = new LinkedHashMap<>();
/**
* Listeners that will be notified when the server has started or is about to be stopped.
......@@ -381,6 +380,7 @@ public class XMPPServer {
certificateStoreManager.start();
final IdentityStore identityStore = certificateStoreManager.getIdentityStore( ConnectionType.SOCKET_C2S );
identityStore.ensureDomainCertificates( "DSA", "RSA" );
} catch (Exception e) {
logger.error("Error generating self-signed certificates", e);
} finally {
......@@ -481,30 +481,63 @@ public class XMPPServer {
}
}
@SuppressWarnings("unchecked")
private void loadModules() {
File modulesXml = new File(JiveGlobals.getHomeDirectory(), "conf/modules.xml");
logger.info("Loading modules from " + modulesXml.getAbsolutePath());
SAXReader xmlReader = new SAXReader();
xmlReader.setEncoding("UTF-8");
try (FileReader in = new FileReader(modulesXml)) {
Document document = xmlReader.read(in);
Element root = document.getRootElement();
Iterator<Node> itr = root.nodeIterator();
while (itr.hasNext()) {
Node n = itr.next();
if (n.getNodeType() == Element.ELEMENT_NODE && "module".equals(n.getName())) {
Element module = (Element)n;
logger.debug("Loading module " + module.attributeValue("implementation") + " to interface " + module.attributeValue("interface"));
loadModule(module.attributeValue("interface"), module.attributeValue("implementation"));
}
}
} catch (Exception e) {
e.printStackTrace();
logger.error(LocaleUtils.getLocalizedString("admin.error"), e);
}
// Load boot modules
loadModule(RoutingTableImpl.class.getName());
loadModule(AuditManagerImpl.class.getName());
loadModule(RosterManager.class.getName());
loadModule(PrivateStorage.class.getName());
// Load core modules
loadModule(PresenceManagerImpl.class.getName());
loadModule(SessionManager.class.getName());
loadModule(PacketRouterImpl.class.getName());
loadModule(IQRouter.class.getName());
loadModule(MessageRouter.class.getName());
loadModule(PresenceRouter.class.getName());
loadModule(MulticastRouter.class.getName());
loadModule(PacketTransporterImpl.class.getName());
loadModule(PacketDelivererImpl.class.getName());
loadModule(TransportHandler.class.getName());
loadModule(OfflineMessageStrategy.class.getName());
loadModule(OfflineMessageStore.class.getName());
loadModule(VCardManager.class.getName());
// Load standard modules
loadModule(IQBindHandler.class.getName());
loadModule(IQSessionEstablishmentHandler.class.getName());
loadModule(IQAuthHandler.class.getName());
loadModule(IQPingHandler.class.getName());
loadModule(IQPrivateHandler.class.getName());
loadModule(IQRegisterHandler.class.getName());
loadModule(IQRosterHandler.class.getName());
loadModule(IQEntityTimeHandler.class.getName());
loadModule(IQvCardHandler.class.getName());
loadModule(IQVersionHandler.class.getName());
loadModule(IQLastActivityHandler.class.getName());
loadModule(PresenceSubscribeHandler.class.getName());
loadModule(PresenceUpdateHandler.class.getName());
loadModule(IQOfflineMessagesHandler.class.getName());
loadModule(IQPEPHandler.class.getName());
loadModule(IQPEPOwnerHandler.class.getName());
loadModule(MulticastDNSService.class.getName());
loadModule(IQSharedGroupHandler.class.getName());
loadModule(AdHocCommandHandler.class.getName());
loadModule(IQPrivacyHandler.class.getName());
loadModule(DefaultFileTransferManager.class.getName());
loadModule(FileTransferProxy.class.getName());
loadModule(MediaProxyService.class.getName());
loadModule(PubSubModule.class.getName());
loadModule(IQDiscoInfoHandler.class.getName());
loadModule(IQDiscoItemsHandler.class.getName());
loadModule(UpdateManager.class.getName());
loadModule(FlashCrossDomainHandler.class.getName());
loadModule(InternalComponentManager.class.getName());
loadModule(MultiUserChatManager.class.getName());
loadModule(IQMessageCarbonsHandler.class.getName());
loadModule(CertificateStoreManager.class.getName());
// Load this module always last since we don't want to start listening for clients
// before the rest of the modules have been started
loadModule(ConnectionManagerImpl.class.getName());
// Keep a reference to the internal component manager
componentManager = getComponentManager();
}
......@@ -512,14 +545,13 @@ public class XMPPServer {
/**
* Loads a module.
*
* @param moduleName the name of the class that implements the Module interface.
* @param module the name of the class that implements the Module interface.
*/
@SuppressWarnings("unchecked")
private void loadModule(String moduleName, String moduleImpl) {
private void loadModule(String module) {
try {
Class<Module> modClass = (Class<Module>) loader.loadClass(moduleImpl);
Class<Module> modClass = (Class<Module>) loader.loadClass(module);
Module mod = modClass.newInstance();
this.modules.put(moduleName, mod);
this.modules.put(modClass, mod);
}
catch (Exception e) {
e.printStackTrace();
......@@ -939,7 +971,7 @@ public class XMPPServer {
* @return the <code>ConnectionManager</code> registered with this server.
*/
public ConnectionManager getConnectionManager() {
return (ConnectionManager) modules.get(ConnectionManager.class.getName());
return (ConnectionManager) modules.get(ConnectionManagerImpl.class);
}
/**
......@@ -950,7 +982,7 @@ public class XMPPServer {
* @return the <code>RoutingTable</code> registered with this server.
*/
public RoutingTable getRoutingTable() {
return (RoutingTable) modules.get(RoutingTable.class.getName());
return (RoutingTable) modules.get(RoutingTableImpl.class);
}
/**
......@@ -961,7 +993,7 @@ public class XMPPServer {
* @return the <code>PacketDeliverer</code> registered with this server.
*/
public PacketDeliverer getPacketDeliverer() {
return (PacketDeliverer) modules.get(PacketDeliverer.class.getName());
return (PacketDeliverer) modules.get(PacketDelivererImpl.class);
}
/**
......@@ -972,7 +1004,7 @@ public class XMPPServer {
* @return the <code>RosterManager</code> registered with this server.
*/
public RosterManager getRosterManager() {
return (RosterManager) modules.get(RosterManager.class.getName());
return (RosterManager) modules.get(RosterManager.class);
}
/**
......@@ -983,7 +1015,7 @@ public class XMPPServer {
* @return the <code>PresenceManager</code> registered with this server.
*/
public PresenceManager getPresenceManager() {
return (PresenceManager) modules.get(PresenceManager.class.getName());
return (PresenceManager) modules.get(PresenceManagerImpl.class);
}
/**
......@@ -994,7 +1026,7 @@ public class XMPPServer {
* @return the <code>OfflineMessageStore</code> registered with this server.
*/
public OfflineMessageStore getOfflineMessageStore() {
return (OfflineMessageStore) modules.get(OfflineMessageStore.class.getName());
return (OfflineMessageStore) modules.get(OfflineMessageStore.class);
}
/**
......@@ -1005,7 +1037,7 @@ public class XMPPServer {
* @return the <code>OfflineMessageStrategy</code> registered with this server.
*/
public OfflineMessageStrategy getOfflineMessageStrategy() {
return (OfflineMessageStrategy) modules.get(OfflineMessageStrategy.class.getName());
return (OfflineMessageStrategy) modules.get(OfflineMessageStrategy.class);
}
/**
......@@ -1016,7 +1048,7 @@ public class XMPPServer {
* @return the <code>PacketRouter</code> registered with this server.
*/
public PacketRouter getPacketRouter() {
return (PacketRouter) modules.get(PacketRouter.class.getName());
return (PacketRouter) modules.get(PacketRouterImpl.class);
}
/**
......@@ -1027,7 +1059,7 @@ public class XMPPServer {
* @return the <code>IQRegisterHandler</code> registered with this server.
*/
public IQRegisterHandler getIQRegisterHandler() {
return (IQRegisterHandler) modules.get(IQRegisterHandler.class.getName());
return (IQRegisterHandler) modules.get(IQRegisterHandler.class);
}
/**
......@@ -1038,7 +1070,7 @@ public class XMPPServer {
* @return the <code>IQAuthHandler</code> registered with this server.
*/
public IQAuthHandler getIQAuthHandler() {
return (IQAuthHandler) modules.get(IQAuthHandler.class.getName());
return (IQAuthHandler) modules.get(IQAuthHandler.class);
}
/**
......@@ -1049,7 +1081,7 @@ public class XMPPServer {
* @return the <code>IQPEPHandler</code> registered with this server.
*/
public IQPEPHandler getIQPEPHandler() {
return (IQPEPHandler) modules.get(IQPEPHandler.class.getName());
return (IQPEPHandler) modules.get(IQPEPHandler.class);
}
/**
......@@ -1069,7 +1101,7 @@ public class XMPPServer {
* @return the <code>PubSubModule</code> registered with this server.
*/
public PubSubModule getPubSubModule() {
return (PubSubModule) modules.get(PubSubModule.class.getName());
return (PubSubModule) modules.get(PubSubModule.class);
}
/**
......@@ -1095,7 +1127,7 @@ public class XMPPServer {
* @return the <code>SessionManager</code> registered with this server.
*/
public SessionManager getSessionManager() {
return (SessionManager) modules.get(SessionManager.class.getName());
return (SessionManager) modules.get(SessionManager.class);
}
/**
......@@ -1106,7 +1138,7 @@ public class XMPPServer {
* @return the <code>TransportHandler</code> registered with this server.
*/
public TransportHandler getTransportHandler() {
return (TransportHandler) modules.get(TransportHandler.class.getName());
return (TransportHandler) modules.get(TransportHandler.class);
}
/**
......@@ -1117,7 +1149,7 @@ public class XMPPServer {
* @return the <code>PresenceUpdateHandler</code> registered with this server.
*/
public PresenceUpdateHandler getPresenceUpdateHandler() {
return (PresenceUpdateHandler) modules.get(PresenceUpdateHandler.class.getName());
return (PresenceUpdateHandler) modules.get(PresenceUpdateHandler.class);
}
/**
......@@ -1128,7 +1160,7 @@ public class XMPPServer {
* @return the <code>PresenceSubscribeHandler</code> registered with this server.
*/
public PresenceSubscribeHandler getPresenceSubscribeHandler() {
return (PresenceSubscribeHandler) modules.get(PresenceSubscribeHandler.class.getName());
return (PresenceSubscribeHandler) modules.get(PresenceSubscribeHandler.class);
}
/**
......@@ -1139,7 +1171,7 @@ public class XMPPServer {
* @return the <code>IQRouter</code> registered with this server.
*/
public IQRouter getIQRouter() {
return (IQRouter) modules.get(IQRouter.class.getName());
return (IQRouter) modules.get(IQRouter.class);
}
/**
......@@ -1150,7 +1182,7 @@ public class XMPPServer {
* @return the <code>MessageRouter</code> registered with this server.
*/
public MessageRouter getMessageRouter() {
return (MessageRouter) modules.get(MessageRouter.class.getName());
return (MessageRouter) modules.get(MessageRouter.class);
}
/**
......@@ -1161,7 +1193,7 @@ public class XMPPServer {
* @return the <code>PresenceRouter</code> registered with this server.
*/
public PresenceRouter getPresenceRouter() {
return (PresenceRouter) modules.get(PresenceRouter.class.getName());
return (PresenceRouter) modules.get(PresenceRouter.class);
}
/**
......@@ -1172,7 +1204,7 @@ public class XMPPServer {
* @return the <code>MulticastRouter</code> registered with this server.
*/
public MulticastRouter getMulticastRouter() {
return (MulticastRouter) modules.get(MulticastRouter.class.getName());
return (MulticastRouter) modules.get(MulticastRouter.class);
}
/**
......@@ -1205,7 +1237,7 @@ public class XMPPServer {
* @return the <code>UpdateManager</code> registered with this server.
*/
public UpdateManager getUpdateManager() {
return (UpdateManager) modules.get(UpdateManager.class.getName());
return (UpdateManager) modules.get(UpdateManager.class);
}
/**
......@@ -1216,7 +1248,7 @@ public class XMPPServer {
* @return the <code>AuditManager</code> registered with this server.
*/
public AuditManager getAuditManager() {
return (AuditManager) modules.get(AuditManager.class.getName());
return (AuditManager) modules.get(AuditManagerImpl.class);
}
/**
......@@ -1306,7 +1338,7 @@ public class XMPPServer {
* @return the <code>IQDiscoInfoHandler</code> registered with this server.
*/
public IQDiscoInfoHandler getIQDiscoInfoHandler() {
return (IQDiscoInfoHandler) modules.get(IQDiscoInfoHandler.class.getName());
return (IQDiscoInfoHandler) modules.get(IQDiscoInfoHandler.class);
}
/**
......@@ -1317,7 +1349,7 @@ public class XMPPServer {
* @return the <code>IQDiscoItemsHandler</code> registered with this server.
*/
public IQDiscoItemsHandler getIQDiscoItemsHandler() {
return (IQDiscoItemsHandler) modules.get(IQDiscoItemsHandler.class.getName());
return (IQDiscoItemsHandler) modules.get(IQDiscoItemsHandler.class);
}
/**
......@@ -1328,7 +1360,7 @@ public class XMPPServer {
* @return the <code>PrivateStorage</code> registered with this server.
*/
public PrivateStorage getPrivateStorage() {
return (PrivateStorage) modules.get(PrivateStorage.class.getName());
return (PrivateStorage) modules.get(PrivateStorage.class);
}
/**
......@@ -1339,7 +1371,7 @@ public class XMPPServer {
* @return the <code>MultiUserChatManager</code> registered with this server.
*/
public MultiUserChatManager getMultiUserChatManager() {
return (MultiUserChatManager) modules.get(MultiUserChatManager.class.getName());
return (MultiUserChatManager) modules.get(MultiUserChatManager.class);
}
/**
......@@ -1350,7 +1382,7 @@ public class XMPPServer {
* @return the <code>AdHocCommandHandler</code> registered with this server.
*/
public AdHocCommandHandler getAdHocCommandHandler() {
return (AdHocCommandHandler) modules.get(AdHocCommandHandler.class.getName());
return (AdHocCommandHandler) modules.get(AdHocCommandHandler.class);
}
/**
......@@ -1361,7 +1393,7 @@ public class XMPPServer {
* @return the <code>FileTransferProxy</code> registered with this server.
*/
public FileTransferProxy getFileTransferProxy() {
return (FileTransferProxy) modules.get(FileTransferProxy.class.getName());
return (FileTransferProxy) modules.get(FileTransferProxy.class);
}
/**
......@@ -1372,7 +1404,7 @@ public class XMPPServer {
* @return the <code>FileTransferProxy</code> registered with this server.
*/
public FileTransferManager getFileTransferManager() {
return (FileTransferManager) modules.get(DefaultFileTransferManager.class.getName());
return (FileTransferManager) modules.get(DefaultFileTransferManager.class);
}
/**
......@@ -1383,7 +1415,7 @@ public class XMPPServer {
* @return the <code>MediaProxyService</code> registered with this server.
*/
public MediaProxyService getMediaProxyService() {
return (MediaProxyService) modules.get(MediaProxyService.class.getName());
return (MediaProxyService) modules.get(MediaProxyService.class);
}
/**
......@@ -1394,7 +1426,7 @@ public class XMPPServer {
* @return the <code>FlashCrossDomainHandler</code> registered with this server.
*/
public FlashCrossDomainHandler getFlashCrossDomainHandler() {
return (FlashCrossDomainHandler) modules.get(FlashCrossDomainHandler.class.getName());
return (FlashCrossDomainHandler) modules.get(FlashCrossDomainHandler.class);
}
/**
......@@ -1415,7 +1447,7 @@ public class XMPPServer {
* @return the <code>InternalComponentManager</code> registered with this server.
*/
private InternalComponentManager getComponentManager() {
return (InternalComponentManager) modules.get(InternalComponentManager.class.getName());
return (InternalComponentManager) modules.get(InternalComponentManager.class);
}
/**
......@@ -1426,7 +1458,7 @@ public class XMPPServer {
* @return the <code>CertificateStoreManager</code> registered with this server.
*/
public CertificateStoreManager getCertificateStoreManager() {
return (CertificateStoreManager) modules.get( CertificateStoreManager.class.getName() );
return (CertificateStoreManager) modules.get( CertificateStoreManager.class );
}
/**
* Returns the locator to use to find sessions hosted in other cluster nodes. When not running
......
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

Technounit-GROUP 2023