Library updates.

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

build/build.xml

@@ -226,9 +226,9 @@
                 <attribute name="Built-By" value="Jive Software (www.jivesoftware.org)"/>
             </manifest>
         </jar>
-        <!-- Copy application dependent jars -->
+        <!-- Copy application dependent files -->
         <copy todir="${jar.dest.dir}">
-            <fileset dir="${lib.dist.dir}" includes="*.jar" />
+            <fileset dir="${lib.dist.dir}" includes="*.*" />
         </copy>
 
         <!-- Setup environment -->

build/lib/versions.txt

 Name                 |  Version
 ---------------------------------------------
-hsqldb.jar           |
-mysql.jar            | 3.0.15
+hsqldb.jar           | 1.7.1
+mysql.jar            | 3.0.16
 postgres.jar         | 7.4 version 215
-ant.jar              | Jetty 5.0.0
-commons-logging.jar  | Jetty 5.0.0
-commons-el.jar       | Jetty 5.0.0
-jetty.jar            | Jetty 5.0.0
-jasper-compiler.jar  | Jetty 5.0.0
-jasper-runtime.jar   | Jetty 5.0.0
-servlet.jar          | Jetty 5.0.0
+ant.jar              | Jetty 5.1.2pre0
+commons-logging.jar  | Jetty 5.1.2pre0
+commons-el.jar       | Jetty 5.1.2pre0
+jetty.jar            | Jetty 5.1.2pre0
+jasper-compiler.jar  | Jetty 5.1.2pre0
+jasper-runtime.jar   | Jetty 5.1.2pre0
+servlet.jar          | Jetty 5.1.2pre0
 dom4j.jar            | 1.5.2
 jaxen.jar            | 1.1 beta 4 (from DOM4J 1.5.2)
 junit.jar            | 3.8.1
 ant-contrib.jar      | 1.0b1
 ant-subdirtask.jar   | Revision 1.4 (CVS)
-jdic.jar             | 0.8.6 (for windows only)
+jdic.jar             | 0.8.7 (for windows only)
 xmltask.jar          | 1.10.5
 jstl.jar             | Jakarta standard taglib 1.1.2
 standard.jar         | Jakarta standard taglib 1.1.2

src/java/org/jivesoftware/messenger/launcher/Launcher.java

@@ -102,8 +102,6 @@ public class Launcher {
         // create the main menu of the system tray icon
         JPopupMenu menu = new JPopupMenu("Messenger Menu");
 
-        menu.addSeparator();
-
         final JMenuItem showMenuItem = new JMenuItem("Hide");
         showMenuItem.setActionCommand("Hide/Show");
         menu.add(showMenuItem);
@@ -255,64 +253,32 @@ public class Launcher {
 
     private synchronized void startApplication() {
         if (messengerd == null) {
-            File binDir = null;
-            File libDir = null;
-            File homeDir = null;
-            File exe = null;
-
             try {
-                // Aliases keep their cwd rather than the aliased binDir's cwd on MacOS X
-                // so we'll do a search for messengerd rather than relying on it being where
-                // we think it will be...
-                binDir = new File("").getAbsoluteFile();
-                libDir = new File("../lib").getAbsoluteFile();
-                homeDir = binDir.getParentFile();
-
-
-                if (libDir.exists()) {
-                    messengerd = Runtime.getRuntime().exec(new String[]{"java", "-jar", new File(libDir, "startup.jar").toString()});
+                File windowsExe = new File(new File("").getAbsoluteFile(), "messengerd.exe");
+                File unixExe = new File(new File("").getAbsoluteFile(), "messengerd");
+                if (windowsExe.exists()) {
+                    messengerd = Runtime.getRuntime().exec(new String[] { windowsExe.toString() });
+                }
+                else if (unixExe.exists()) {
+                     messengerd = Runtime.getRuntime().exec(new String[] { unixExe.toString() });   
                 }
                 else {
-                    // MacOS X
-                    exe = new File(homeDir, "messenger.app");
-
-                    if (exe.exists()) {
-                        messengerd = Runtime.getRuntime().exec(new String[]{
-                            "open", exe.toString()
-                        });
-                    }
-                    else {
-                        // Unix
-                        exe = new File(homeDir, "messenger");
-
-                        if (exe.exists()) {
-                            messengerd = Runtime.getRuntime().exec(new String[]{exe.toString()});
-                        }
-                        else {
-                            throw new FileNotFoundException();
-                        }
-                    }
+                    throw new FileNotFoundException();
                 }
             }
             catch (Exception e) {
+                e.printStackTrace();
                 // Try one more time using the jar and hope java is on the path
                 try {
-                    if (binDir != null) {
-                        messengerd = Runtime.getRuntime().exec(new String[]{
-                            "java", "-jar", new File(libDir, "startup.jar").toString()
-                        });
-                    }
-                    else {
-                        e.printStackTrace();
-                        JOptionPane.showMessageDialog(null,
-                                "Launcher could not locate messengerd,\nthe Jive Messenger server daemon executable",
-                                "File not found", JOptionPane.ERROR_MESSAGE);
-                    }
+                    File libDir = new File("../lib").getAbsoluteFile();
+                    messengerd = Runtime.getRuntime().exec(new String[]{
+                        "java", "-jar", new File(libDir, "startup.jar").toString()
+                    });
                 }
                 catch (Exception ex) {
                     ex.printStackTrace();
                     JOptionPane.showMessageDialog(null,
-                            "Launcher could not locate messengerd,\nthe Jive Messenger server daemon executable",
+                            "Launcher could not start,\nJive Messenger",
                             "File not found", JOptionPane.ERROR_MESSAGE);
                 }
             }

src/web/setup-host-settings.jsp

@@ -134,6 +134,10 @@ LABEL { font-weight : normal; }
         <input type="radio" name="sslEnabled" value="false" id="rb02"
             <%= ((!sslEnabled) ? " checked" : "") %>>
         <label for="rb02">No</label>
+        <span class="jive-description">
+        <br>
+        Enables or disables secure XMPP connections are allowed.
+        </span>
     </td>
 </tr>
 </table>