diff -Nbdru org/jivesoftware/smack/ConnectionConfiguration.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/ConnectionConfiguration.java

--- org/jivesoftware/smack/ConnectionConfiguration.java	2009-06-26 21:11:24.609252239 +0200

+++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/ConnectionConfiguration.java	2009-06-25 22:41:46.281648000 +0200

@@ -63,7 +63,7 @@

      */

     private CallbackHandler callbackHandler;

-    private boolean debuggerEnabled = XMPPConnection.DEBUG_ENABLED;

+    private boolean debuggerEnabled = false;

     // Flag that indicates if a reconnection should be attempted when abruptly disconnected

     private boolean reconnectionAllowed = true;

diff -Nbdru org/jivesoftware/smack/debugger/LiteDebugger.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/debugger/LiteDebugger.java

--- org/jivesoftware/smack/debugger/LiteDebugger.java	2009-06-26 21:11:22.316252115 +0200

+++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/debugger/LiteDebugger.java	1970-01-01 01:00:00.000000000 +0100

@@ -1,336 +0,0 @@

-/**

- * $RCSfile$

- * $Revision: 7071 $

- * $Date: 2007-02-12 01:59:05 +0100 (Mon, 12 Feb 2007) $

- *

- * Copyright 2003-2007 Jive Software.

- *

- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-package org.jivesoftware.smack.debugger;

-

-import java.awt.*;

-import java.awt.datatransfer.*;

-import java.awt.event.*;

-import java.io.*;

-

-import javax.swing.*;

-

-import org.jivesoftware.smack.*;

-import org.jivesoftware.smack.packet.*;

-import org.jivesoftware.smack.util.*;

-

-/**

- * The LiteDebugger is a very simple debugger that allows to debug sent, received and 

- * interpreted messages.

- * 

- * @author Gaston Dombiak

- */

-public class LiteDebugger implements SmackDebugger {

-

-    private static final String NEWLINE = "\n";

-

-    private JFrame frame = null;

-    private XMPPConnection connection = null;

-

-    private PacketListener listener = null;

-

-    private Writer writer;

-    private Reader reader;

-    private ReaderListener readerListener;

-    private WriterListener writerListener;

-

-    public LiteDebugger(XMPPConnection connection, Writer writer, Reader reader) {

-        this.connection = connection;

-        this.writer = writer;

-        this.reader = reader;

-        createDebug();

-    }

-

-    /**

-     * Creates the debug process, which is a GUI window that displays XML traffic.

-     */

-    private void createDebug() {

-        frame = new JFrame("Smack Debug Window -- " + connection.getServiceName() + ":" +

-                connection.getPort());

-

-        // Add listener for window closing event 

-        frame.addWindowListener(new WindowAdapter() {

-            public void windowClosing(WindowEvent evt) {

-                rootWindowClosing(evt);

-            }

-        });

-

-        // We'll arrange the UI into four tabs. The first tab contains all data, the second

-        // client generated XML, the third server generated XML, and the fourth is packet

-        // data from the server as seen by Smack.

-        JTabbedPane tabbedPane = new JTabbedPane();

-

-        JPanel allPane = new JPanel();

-        allPane.setLayout(new GridLayout(3, 1));

-        tabbedPane.add("All", allPane);

-

-        // Create UI elements for client generated XML traffic.

-        final JTextArea sentText1 = new JTextArea();

-        final JTextArea sentText2 = new JTextArea();

-        sentText1.setEditable(false);

-        sentText2.setEditable(false);

-        sentText1.setForeground(new Color(112, 3, 3));

-        sentText2.setForeground(new Color(112, 3, 3));

-        allPane.add(new JScrollPane(sentText1));

-        tabbedPane.add("Sent", new JScrollPane(sentText2));

-

-        // Add pop-up menu.

-        JPopupMenu menu = new JPopupMenu();

-        JMenuItem menuItem1 = new JMenuItem("Copy");

-        menuItem1.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent e) {

-                // Get the clipboard

-                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

-                // Set the sent text as the new content of the clipboard

-                clipboard.setContents(new StringSelection(sentText1.getText()), null);

-            }

-        });

-

-        JMenuItem menuItem2 = new JMenuItem("Clear");

-        menuItem2.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent e) {

-                sentText1.setText("");

-                sentText2.setText("");

-            }

-        });

-

-        // Add listener to the text area so the popup menu can come up.

-        MouseListener popupListener = new PopupListener(menu);

-        sentText1.addMouseListener(popupListener);

-        sentText2.addMouseListener(popupListener);

-        menu.add(menuItem1);

-        menu.add(menuItem2);

-

-        // Create UI elements for server generated XML traffic.

-        final JTextArea receivedText1 = new JTextArea();

-        final JTextArea receivedText2 = new JTextArea();

-        receivedText1.setEditable(false);

-        receivedText2.setEditable(false);

-        receivedText1.setForeground(new Color(6, 76, 133));

-        receivedText2.setForeground(new Color(6, 76, 133));

-        allPane.add(new JScrollPane(receivedText1));

-        tabbedPane.add("Received", new JScrollPane(receivedText2));

-

-        // Add pop-up menu.

-        menu = new JPopupMenu();

-        menuItem1 = new JMenuItem("Copy");

-        menuItem1.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent e) {

-                // Get the clipboard

-                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

-                // Set the sent text as the new content of the clipboard

-                clipboard.setContents(new StringSelection(receivedText1.getText()), null);

-            }

-        });

-

-        menuItem2 = new JMenuItem("Clear");

-        menuItem2.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent e) {

-                receivedText1.setText("");

-                receivedText2.setText("");

-            }

-        });

-

-        // Add listener to the text area so the popup menu can come up.

-        popupListener = new PopupListener(menu);

-        receivedText1.addMouseListener(popupListener);

-        receivedText2.addMouseListener(popupListener);

-        menu.add(menuItem1);

-        menu.add(menuItem2);

-

-        // Create UI elements for interpreted XML traffic.

-        final JTextArea interpretedText1 = new JTextArea();

-        final JTextArea interpretedText2 = new JTextArea();

-        interpretedText1.setEditable(false);

-        interpretedText2.setEditable(false);

-        interpretedText1.setForeground(new Color(1, 94, 35));

-        interpretedText2.setForeground(new Color(1, 94, 35));

-        allPane.add(new JScrollPane(interpretedText1));

-        tabbedPane.add("Interpreted", new JScrollPane(interpretedText2));

-

-        // Add pop-up menu.

-        menu = new JPopupMenu();

-        menuItem1 = new JMenuItem("Copy");

-        menuItem1.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent e) {

-                // Get the clipboard

-                Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

-                // Set the sent text as the new content of the clipboard

-                clipboard.setContents(new StringSelection(interpretedText1.getText()), null);

-            }

-        });

-

-        menuItem2 = new JMenuItem("Clear");

-        menuItem2.addActionListener(new ActionListener() {

-            public void actionPerformed(ActionEvent e) {

-                interpretedText1.setText("");

-                interpretedText2.setText("");

-            }

-        });

-

-        // Add listener to the text area so the popup menu can come up.

-        popupListener = new PopupListener(menu);

-        interpretedText1.addMouseListener(popupListener);

-        interpretedText2.addMouseListener(popupListener);

-        menu.add(menuItem1);

-        menu.add(menuItem2);

-

-        frame.getContentPane().add(tabbedPane);

-

-        frame.setSize(550, 400);

-        frame.setVisible(true);

-

-        // Create a special Reader that wraps the main Reader and logs data to the GUI.

-        ObservableReader debugReader = new ObservableReader(reader);

-        readerListener = new ReaderListener() {

-                    public void read(String str) {

-                        int index = str.lastIndexOf(">");

-                        if (index != -1) {

-                            receivedText1.append(str.substring(0, index + 1));

-                            receivedText2.append(str.substring(0, index + 1));

-                            receivedText1.append(NEWLINE);

-                            receivedText2.append(NEWLINE);

-                            if (str.length() > index) {

-                                receivedText1.append(str.substring(index + 1));

-                                receivedText2.append(str.substring(index + 1));

-                            }

-                        }

-                        else {

-                            receivedText1.append(str);

-                            receivedText2.append(str);

-                        }

-                    }

-                };

-        debugReader.addReaderListener(readerListener);

-

-        // Create a special Writer that wraps the main Writer and logs data to the GUI.

-        ObservableWriter debugWriter = new ObservableWriter(writer);

-        writerListener = new WriterListener() {

-                    public void write(String str) {

-                        sentText1.append(str);

-                        sentText2.append(str);

-                        if (str.endsWith(">")) {

-                            sentText1.append(NEWLINE);

-                            sentText2.append(NEWLINE);

-                        }

-                    }

-                };

-        debugWriter.addWriterListener(writerListener);

-

-        // Assign the reader/writer objects to use the debug versions. The packet reader

-        // and writer will use the debug versions when they are created.

-        reader = debugReader;

-        writer = debugWriter;

-

-        // Create a thread that will listen for all incoming packets and write them to

-        // the GUI. This is what we call "interpreted" packet data, since it's the packet

-        // data as Smack sees it and not as it's coming in as raw XML.

-        listener = new PacketListener() {

-            public void processPacket(Packet packet) {

-                interpretedText1.append(packet.toXML());

-                interpretedText2.append(packet.toXML());

-                interpretedText1.append(NEWLINE);

-                interpretedText2.append(NEWLINE);

-            }

-        };

-    }

-

-    /**

-     * Notification that the root window is closing. Stop listening for received and 

-     * transmitted packets.

-     * 

-     * @param evt the event that indicates that the root window is closing 

-     */

-    public void rootWindowClosing(WindowEvent evt) {

-        connection.removePacketListener(listener);

-        ((ObservableReader)reader).removeReaderListener(readerListener);

-        ((ObservableWriter)writer).removeWriterListener(writerListener);

-    }

-

-    /**

-     * Listens for debug window popup dialog events.

-     */

-    private class PopupListener extends MouseAdapter {

-        JPopupMenu popup;

-

-        PopupListener(JPopupMenu popupMenu) {

-            popup = popupMenu;

-        }

-

-        public void mousePressed(MouseEvent e) {

-            maybeShowPopup(e);

-        }

-

-        public void mouseReleased(MouseEvent e) {

-            maybeShowPopup(e);

-        }

-

-        private void maybeShowPopup(MouseEvent e) {

-            if (e.isPopupTrigger()) {

-                popup.show(e.getComponent(), e.getX(), e.getY());

-            }

-        }

-    }

-

-    public Reader newConnectionReader(Reader newReader) {

-        ((ObservableReader)reader).removeReaderListener(readerListener);

-        ObservableReader debugReader = new ObservableReader(newReader);

-        debugReader.addReaderListener(readerListener);

-        reader = debugReader;

-        return reader;

-    }

-

-    public Writer newConnectionWriter(Writer newWriter) {

-        ((ObservableWriter)writer).removeWriterListener(writerListener);

-        ObservableWriter debugWriter = new ObservableWriter(newWriter);

-        debugWriter.addWriterListener(writerListener);

-        writer = debugWriter;

-        return writer;

-    }

-

-    public void userHasLogged(String user) {

-        boolean isAnonymous = "".equals(StringUtils.parseName(user));

-        String title =

-            "Smack Debug Window -- "

-                + (isAnonymous ? "" : StringUtils.parseBareAddress(user))

-                + "@"

-                + connection.getServiceName()

-                + ":"

-                + connection.getPort();

-        title += "/" + StringUtils.parseResource(user);

-        frame.setTitle(title);

-    }

-

-    public Reader getReader() {

-        return reader;

-    }

-

-    public Writer getWriter() {

-        return writer;

-    }

-

-    public PacketListener getReaderListener() {

-        return listener;

-    }

-

-    public PacketListener getWriterListener() {

-        return null;

-    }

-}

diff -Nbdru org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java

--- org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java	2009-06-26 21:11:23.436473310 +0200

+++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java	2009-06-26 20:56:01.656252399 +0200

@@ -25,8 +25,9 @@

 import java.io.IOException;

 import java.util.Map;

 import java.util.HashMap;

-import javax.security.sasl.Sasl;

-import javax.security.sasl.SaslClient;

+

+import security.javax.security.sasl.Sasl;

+

 import javax.security.auth.callback.CallbackHandler;

 /**

@@ -63,7 +64,7 @@

         String[] mechanisms = { getName() };

         Map props = new HashMap();

         props.put(Sasl.SERVER_AUTH,"TRUE");

-        sc = Sasl.createSaslClient(mechanisms, username, "xmpp", host, props, cbh);

+        sc = Sasl.createSaslClient(mechanisms, username, "xmpp", host, props, (javax.security.auth.callback.CallbackHandler)cbh);

         authenticate();

     }

diff -Nbdru org/jivesoftware/smack/sasl/SASLMechanism.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLMechanism.java

--- org/jivesoftware/smack/sasl/SASLMechanism.java	2009-06-26 21:11:23.436473310 +0200

+++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/sasl/SASLMechanism.java	2009-06-26 21:23:03.244251498 +0200

@@ -20,23 +20,25 @@

 package org.jivesoftware.smack.sasl;

-import org.jivesoftware.smack.XMPPException;

-import org.jivesoftware.smack.SASLAuthentication;

-import org.jivesoftware.smack.util.Base64;

-

 import java.io.IOException;

-import java.util.Map;

 import java.util.HashMap;

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.callback.UnsupportedCallbackException;

+import java.util.Map;

+

 import javax.security.auth.callback.Callback;

-import javax.security.auth.callback.NameCallback;

+import javax.security.auth.callback.CallbackHandler;

 import javax.security.auth.callback.PasswordCallback;

-import javax.security.sasl.RealmCallback;

-import javax.security.sasl.RealmChoiceCallback;

-import javax.security.sasl.Sasl;

-import javax.security.sasl.SaslClient;

-import javax.security.sasl.SaslException;

+import javax.security.auth.callback.UnsupportedCallbackException;

+

+import org.jivesoftware.smack.SASLAuthentication;

+import org.jivesoftware.smack.XMPPException;

+import org.jivesoftware.smack.util.Base64;

+

+import security.javax.security.auth.callback.NameCallback;

+import security.javax.security.sasl.RealmCallback;

+import security.javax.security.sasl.RealmChoiceCallback;

+import security.javax.security.sasl.Sasl;

+import security.javax.security.sasl.SaslClient;

+import security.javax.security.sasl.SaslException;

 /**

  * Base class for SASL mechanisms. Subclasses must implement these methods:

@@ -148,12 +150,13 @@

         } else {

             response = sc.evaluateChallenge(null);

         }

-

-        String authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES);

+        String authenticationText = "";

+        if (response != null) {

+        authenticationText = Base64.encodeBytes(response,Base64.DONT_BREAK_LINES);

         if(authenticationText.equals("")) {

             authenticationText = "=";

         }

-

+        }

         stanza.append("<response xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");

         stanza.append(authenticationText);

         stanza.append("</response>");

diff -Nbdru org/jivesoftware/smack/SASLAuthentication.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/SASLAuthentication.java

--- org/jivesoftware/smack/SASLAuthentication.java	2009-06-26 21:11:24.597252589 +0200

+++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/SASLAuthentication.java	2009-06-26 21:31:16.445251493 +0200

@@ -84,17 +84,15 @@

         // Register SASL mechanisms supported by Smack

         registerSASLMechanism("EXTERNAL", SASLExternalMechanism.class);

-        registerSASLMechanism("GSSAPI", SASLGSSAPIMechanism.class);

         registerSASLMechanism("DIGEST-MD5", SASLDigestMD5Mechanism.class);

         registerSASLMechanism("CRAM-MD5", SASLCramMD5Mechanism.class);

         registerSASLMechanism("PLAIN", SASLPlainMechanism.class);

         registerSASLMechanism("ANONYMOUS", SASLAnonymous.class);

-        supportSASLMechanism("GSSAPI",0);

-        supportSASLMechanism("DIGEST-MD5",1);

-        supportSASLMechanism("CRAM-MD5",2);

-        supportSASLMechanism("PLAIN",3);

-        supportSASLMechanism("ANONYMOUS",4);

+        supportSASLMechanism("DIGEST-MD5",0);

+        supportSASLMechanism("CRAM-MD5",1);

+        supportSASLMechanism("PLAIN",2);

+        supportSASLMechanism("ANONYMOUS",3);

     }

diff -Nbdru org/jivesoftware/smack/util/DNSUtil.java /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/util/DNSUtil.java

--- org/jivesoftware/smack/util/DNSUtil.java	2009-06-26 21:11:24.585252398 +0200

+++ /home/nikita/devel/beem-ui/src/org/jivesoftware/smack/util/DNSUtil.java	2009-06-26 00:41:16.932251881 +0200

@@ -22,12 +22,6 @@

 import java.util.Hashtable;

 import java.util.Map;

-import javax.naming.NamingEnumeration;

-import javax.naming.directory.Attribute;

-import javax.naming.directory.Attributes;

-import javax.naming.directory.DirContext;

-import javax.naming.directory.InitialDirContext;

-

 /**

  * Utilty class to perform DNS lookups for XMPP services.

  *

@@ -41,13 +35,13 @@

      */

     private static Map cache = new Cache(100, 1000*60*10);

-    private static DirContext context;

+//    private static DirContext context;

     static {

         try {

             Hashtable env = new Hashtable();

             env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");

-            context = new InitialDirContext(env);

+ //           context = new InitialDirContext(env);

         }

         catch (Exception e) {

             // Ignore.

@@ -79,65 +73,8 @@

      *      server can be reached at for the specified domain.

      */

     public static HostAddress resolveXMPPDomain(String domain) {

-        if (context == null) {

             return new HostAddress(domain, 5222);

         }

-        String key = "c" + domain;

-        // Return item from cache if it exists.

-        if (cache.containsKey(key)) {

-            HostAddress address = (HostAddress)cache.get(key);

-            if (address != null) {

-                return address;

-            }

-        }

-        String bestHost = domain;

-        int bestPort = 5222;

-        int bestPriority = 0;

-        int bestWeight = 0;

-        try {

-            Attributes dnsLookup = context.getAttributes("_xmpp-client._tcp." + domain, new String[]{"SRV"});

-            Attribute srvAttribute = dnsLookup.get("SRV");

-            NamingEnumeration srvRecords = srvAttribute.getAll();

-            while(srvRecords.hasMore()) {

-				String srvRecord = (String) srvRecords.next();

-	            String [] srvRecordEntries = srvRecord.split(" ");

-	            int priority = Integer.parseInt(srvRecordEntries[srvRecordEntries.length - 4]);

-	            int port = Integer.parseInt(srvRecordEntries[srvRecordEntries.length-2]);

-	            int weight = Integer.parseInt(srvRecordEntries[srvRecordEntries.length - 3]);

-	            String host = srvRecordEntries[srvRecordEntries.length-1];

-	            

-	            // Randomize the weight.

-	            weight *= Math.random() * weight;

-	            

-	            if ((bestPriority == 0) || (priority < bestPriority)) {

-	            	// Choose a server with the lowest priority.

-	            	bestPriority = priority;