OO-360, removing warning ifan IM listener is not found (it can happen), remove...

OO-360, removing warning ifan IM listener is not found (it can happen), remove support for SSL connection to openfire to save memory

pom.xml

@@ -1182,17 +1182,17 @@
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>
-			<version>1.6.0</version>
+			<version>1.7.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcmail-jdk15</artifactId>
-			<version>1.44</version>
+			<version>1.46</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15</artifactId>
-			<version>1.44</version>
+			<version>1.46</version>
 		</dependency>
 		<dependency>
 			<groupId>jdom</groupId>

src/main/java/org/olat/instantMessaging/ClientManagerImpl.java

@@ -159,8 +159,6 @@ public class ClientManagerImpl extends BasicManager implements ClientManager {
 				if (listener != null){
 					listener.event(new InstantMessagingEvent(packet, "message"));
 					if (isLogDebugEnabled()) logDebug("routing message event to controller of: "+packet.getTo());
-				} else {
-					logWarn("could not find listener for IM message for username: "+username, null);
 				}
 			}
 		};
@@ -176,12 +174,8 @@ public class ClientManagerImpl extends BasicManager implements ClientManager {
 			public void processPacket(Packet packet) {
 				try {
 					GenericEventListener listener = listeners.get(username);
-					if (listener == null) {
-						logWarn("could not route presence event as presence listener is null for user: "+username, null);
-					} else {
+					if (listener != null) {
 						listener.event(new InstantMessagingEvent(packet, "presence"));
-						Presence presence = (Presence) packet;
-						if (isLogDebugEnabled()) logDebug("routing presence event to controller of: "+presence.getTo());
 					}
 				} catch(Throwable th){
 					logWarn("Presence package", th);

src/main/java/org/olat/instantMessaging/InstantMessagingModule.java

@@ -26,7 +26,10 @@
 
 package org.olat.instantMessaging;
 
+import javax.net.SocketFactory;
+
 import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
 import org.jivesoftware.smack.XMPPConnection;
 import org.olat.admin.user.delete.service.UserDeletionManager;
 import org.olat.core.commons.persistence.DB;
@@ -157,6 +160,10 @@ public class InstantMessagingModule implements Initializable, Destroyable, UserD
 			connConfig.setNotMatchingDomainCheckEnabled(false);
 			connConfig.setSASLAuthenticationEnabled(false);
 			connConfig.setReconnectionAllowed(false);
+			//disable the SSL connection to save a lot of memory
+			connConfig.setSecurityMode(SecurityMode.disabled);
+			//make sure that smackx doesn't use the SSLSocketFactory
+			connConfig.setSocketFactory(SocketFactory.getDefault());
 		}
 		return connConfig;
 	}