Minor fixes.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@112 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/net/SocketAcceptThread.java

@@ -29,7 +29,7 @@ import java.net.UnknownHostException;
 public class SocketAcceptThread extends Thread {
 
     /**
-     * The default Jabber socket.
+     * The default XMPP port.
      */
     public static final int DEFAULT_PORT = 5222;
 
@@ -58,11 +58,7 @@ public class SocketAcceptThread extends Thread {
     public SocketAcceptThread(ConnectionManager connManager) {
         super("SAT accept");
         this.connManager = connManager;
-        port = SocketAcceptThread.DEFAULT_PORT;
-        String portName = JiveGlobals.getProperty("xmpp.socket.plain.port");
-        if (portName != null) {
-            port = Integer.parseInt(portName);
-        }
+        port = JiveGlobals.getIntProperty("xmpp.socket.plain.port", DEFAULT_PORT);
         String interfaceName = JiveGlobals.getProperty("xmpp.socket.plain.interface");
         bindInterface = null;
         if (interfaceName != null) {

src/java/org/jivesoftware/messenger/spi/ConnectionManagerImpl.java

@@ -94,10 +94,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
         else {
             socketThread = new SocketAcceptThread(this);
             ports.add(new ServerPortImpl(socketThread.getPort(),
-                    serverName,
-                    localIPAddress,
-                    false,
-                    null));
+                    serverName, localIPAddress, false, null));
             socketThread.setDaemon(true);
             socketThread.start();
 
@@ -105,7 +102,6 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
             params.add(Integer.toString(socketThread.getPort()));
             Log.info(LocaleUtils.getLocalizedString("startup.plain", params));
         }
-
     }
 
     public Iterator getPorts() {
@@ -129,11 +125,8 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
                     isSecure);
             Session session = sessionManager.createSession(conn);
             SocketReadThread reader = new SocketReadThread(router,
-                    packetFactory,
-                    serverName,
-                    auditManager.getAuditor(),
-                    sock,
-                    session);
+                    packetFactory, serverName, auditManager.getAuditor(),
+                    sock, session);
             reader.setDaemon(true);
             reader.start();
         }

src/java/org/jivesoftware/net/spi/AcceptManagerImpl.java

@@ -86,7 +86,7 @@ public class AcceptManagerImpl extends BasicModule implements AcceptManager {
                 throw new AlreadyExistsException(portAddress.toString());
             }
         }
-        AcceptPort acceptPort = new AcceptPortImpl("port" + ports.size(),
+        AcceptPort acceptPort = new AcceptPortImpl("acceptPorts.port" + ports.size(),
                 connManager, portAddress);
         ports.add(acceptPort);
         return acceptPort;
@@ -125,6 +125,12 @@ public class AcceptManagerImpl extends BasicModule implements AcceptManager {
                 AcceptPort port = new AcceptPortImpl(propName, connManager);
                 ports.add(port);
             }
+            if (ports.size() == 0) {
+                // Add a default
+                JiveGlobals.setProperty("acceptPorts.port1.portnumber", "5222");
+                AcceptPort port = new AcceptPortImpl("acceptPorts.port1", connManager);
+                ports.add(port);
+            }
         }
     }
 }

src/java/org/jivesoftware/net/spi/AcceptPortImpl.java

@@ -38,8 +38,17 @@ public class AcceptPortImpl implements AcceptPort {
         this.context = context;
         conManager = connectionManager;
         String hostname = JiveGlobals.getProperty(context + ".hostname");
-        String port = JiveGlobals.getProperty(".portnumber");
-        address = new InetSocketAddress(hostname,Integer.parseInt(port));
+        int port = JiveGlobals.getIntProperty(context + ".portnumber", -1);
+        if (port == -1) {
+            Log.error("No port number set for " + context);
+            return;
+        }
+        if (hostname == null) {
+            address = new InetSocketAddress(port);
+        }
+        else {
+            address = new InetSocketAddress(hostname, port);
+        }
     }
 
     public AcceptPortImpl(String context, ConnectionManager connectionManager,