Index: src/main/java/hudson/plugins/jabber/im/transport/JabberPublisherDescriptor.java
===================================================================
--- src/main/java/hudson/plugins/jabber/im/transport/JabberPublisherDescriptor.java (revision 28599)
+++ src/main/java/hudson/plugins/jabber/im/transport/JabberPublisherDescriptor.java Mon Mar 22 12:08:44 MDT 2010
@@ -47,6 +47,8 @@
public static final String PARAMETERNAME_PORT = JabberPublisherDescriptor.PREFIX + "port";
public static final String PARAMETERNAME_HOSTNAME = JabberPublisherDescriptor.PREFIX + "hostname";
public static final String PARAMETERNAME_SSL = JabberPublisherDescriptor.PREFIX + "ssl";
+ public static final String PARAMETERNAME_SASL = JabberPublisherDescriptor.PREFIX + "enableSASL";
+ public static final String PARAMETERNAME_SMACK_RECONNECT = JabberPublisherDescriptor.PREFIX + "smackReconnect";
public static final String PARAMETERNAME_PRESENCE = JabberPublisherDescriptor.PREFIX + "exposePresence";
public static final String PARAMETERNAME_PASSWORD = JabberPublisherDescriptor.PREFIX + "password";
public static final String PARAMETERNAME_JABBERID = JabberPublisherDescriptor.PREFIX + "jabberId";
@@ -97,6 +99,8 @@
private String hudsonPassword;
private String groupChatNickname;
private boolean exposePresence = true;
+ private boolean enableSASL = true;
+ private boolean smackReconnect = false;
private String initialGroupChats;
private String commandPrefix = DEFAULT_COMMAND_PREFIX;
private String defaultIdSuffix;
@@ -329,6 +333,14 @@
else return String.valueOf(port);
}
+ public boolean isEnableSASL() {
+ return enableSASL;
+ }
+
+ public boolean isSmackReconnect() {
+ return smackReconnect;
+ }
+
public boolean isExposePresence() {
return this.exposePresence;
}
@@ -422,6 +434,8 @@
String en = req.getParameter(PARAMETERNAME_ENABLED);
this.enabled = Boolean.valueOf(en != null);
this.exposePresence = req.getParameter(JabberPublisherDescriptor.PARAMETERNAME_PRESENCE) != null;
+ this.enableSASL = req.getParameter(JabberPublisherDescriptor.PARAMETERNAME_SASL) != null;
+ this.smackReconnect = req.getParameter(JabberPublisherDescriptor.PARAMETERNAME_SMACK_RECONNECT) != null;
this.subscriptionMode = Util.fixEmptyAndTrim(req.getParameter(JabberPublisherDescriptor.PARAMETERNAME_SUBSCRIPTION_MODE));
applyHostname(req);
applyPort(req);
Index: src/main/resources/hudson/plugins/jabber/im/transport/JabberPublisher/global.jelly
===================================================================
--- src/main/resources/hudson/plugins/jabber/im/transport/JabberPublisher/global.jelly (revision 28599)
+++ src/main/resources/hudson/plugins/jabber/im/transport/JabberPublisher/global.jelly Mon Mar 22 13:35:28 MDT 2010
@@ -1,64 +1,78 @@
+ If your connection doesn't work, and you see an error in the logs that reads: + WARNING: SASL authentication failed using mechanism PLAIN + you should disable SASL authentication. +
+