Revert "Update installer files to make sure modules.xml file is delivered with each update"

This reverts commit 285b2093.

Conflicts:
	build/build.xml

build/build.xml

@@ -1787,4 +1787,4 @@
         </copy>
     </target>
 
-</project>
+</project>
\ No newline at end of file

build/debian/openfire.conffiles

 /etc/openfire/openfire.xml
-/etc/openfire/modules.xml
 /etc/openfire/security.xml
 /etc/openfire/security/keystore
 /etc/openfire/security/truststore

build/installer/openfire.install4j

@@ -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

@@ -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/java/org/jivesoftware/openfire/XMPPServer.java

@@ -17,33 +17,7 @@
 
 package org.jivesoftware.openfire;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.security.KeyStore;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 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;
@@ -62,20 +36,19 @@ import org.jivesoftware.openfire.filetransfer.DefaultFileTransferManager;
 import org.jivesoftware.openfire.filetransfer.FileTransferManager;
 import org.jivesoftware.openfire.filetransfer.proxy.FileTransferProxy;
 import org.jivesoftware.openfire.handler.*;
-import org.jivesoftware.openfire.keystore.*;
+import org.jivesoftware.openfire.keystore.CertificateStoreManager;
+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.SSLConfig;
 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;
@@ -86,6 +59,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmpp.packet.JID;
 
+import java.io.*;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 /**
  * The main XMPP server that will load, initialize and start all the server's
  * modules. The server is unique in the JVM and could be obtained by using the
@@ -498,7 +481,6 @@ public class XMPPServer {
         }
     }
 
-    @SuppressWarnings("unchecked")
 	private void loadModules() {
         // Load boot modules
         loadModule(RoutingTableImpl.class.getName());
@@ -527,7 +509,6 @@ public class XMPPServer {
         loadModule(IQPrivateHandler.class.getName());
         loadModule(IQRegisterHandler.class.getName());
         loadModule(IQRosterHandler.class.getName());
-        loadModule(IQTimeHandler.class.getName());
         loadModule(IQEntityTimeHandler.class.getName());
         loadModule(IQvCardHandler.class.getName());
         loadModule(IQVersionHandler.class.getName());
@@ -551,9 +532,9 @@ public class XMPPServer {
         loadModule(FlashCrossDomainHandler.class.getName());
         loadModule(InternalComponentManager.class.getName());
         loadModule(MultiUserChatManager.class.getName());
-        loadModule(ClearspaceManager.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());
@@ -568,7 +549,7 @@ public class XMPPServer {
      */
     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(modClass, mod);
         }