Add support for GoogleTalk to XMPP-based notification strategies.
Description
The original XMPP notification strategies used the one-argument version of the XMPPConnection class:
XMPPConnection(String serviceName)
In order to connect to GoogleTalk, the three-argument version is required:
XMPPConnection(String host, int port, String serviceName)
This constructor was not available in the smack/smackx libraries included in
OpenNMS 1.2.5, so new libraries have been included. In addition, modifications have been made to implement the use of the two new parameters, 'host' and 'port'.
etc/xmpp-configuration.properties
Added host and port options for GoogleTalk compatibility.
Renamed 'xmpp.server' property to 'xmpp.servicename' to conform to smack library parameter names.
lib/smack.jar
lib/smackx.jar
Upgraded JiveSoftware smack libraries to version 2.1.0 for GoogleTalk compatibility.
Added code path for XMPPConnection constructor using host and port parameters for GoogleTalk compatibility.
Environment
Operating System: Linux
Platform: PC
Acceptance / Success Criteria
None
Attachments
3
Lucidchart Diagrams
Activity
Show:
David Hustace January 11, 2009 at 11:08 PM
requires revision 11805, too.
David Hustace January 11, 2009 at 10:35 PM
verified and merged to 1.6 branch revision 11804
Benjamin Reed December 9, 2008 at 4:34 PM
I'd already done most of this when moving to smack 3.0.4, completely forgot about this bug when I did =)
Anyways, marking as fixed. I implemented it slightly differently, so that existing configs will continue to work. The only thing added was "xmpp.servicename" which will use the value of "xmpp.server" if it's not set.
fixed in 1.6-testing, r11454
Benjamin Reed October 6, 2008 at 11:52 AM
moving to 1.6.1 target milestone; only things left pending for 1.6.0 are blocker-level bugs
Chris Abernethy November 23, 2005 at 10:35 PM
This is a patch against version OPENNMS_1_2_5_RELEASE.
The original XMPP notification strategies used the one-argument version of the
XMPPConnection class:
XMPPConnection(String serviceName)
In order to connect to GoogleTalk, the three-argument version is required:
XMPPConnection(String host, int port, String serviceName)
This constructor was not available in the smack/smackx libraries included in
OpenNMS 1.2.5, so new libraries have been included. In addition, modifications
have been made to implement the use of the two new parameters, 'host' and 'port'.
etc/xmpp-configuration.properties
Added host and port options for GoogleTalk compatibility.
Renamed 'xmpp.server' property to 'xmpp.servicename' to conform to smack
library parameter names.
lib/smack.jar
lib/smackx.jar
Upgraded JiveSoftware smack libraries to version 2.1.0 for GoogleTalk
compatibility.
src/services/org/opennms/netmgt/notifd/XMPPNotificationManager.java
Implemented use of new xmpp properties.
Added code path for XMPPConnection constructor using host and port
parameters for GoogleTalk compatibility.