Temporary branch to share code with Noah so we can both try to fix some TLS issues.

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

fixingTLS/Admin.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/src/web/classes" />
+    <exclude-output />
+    <exclude-exploded />
+    <content url="file://$MODULE_DIR$/src/web" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Messenger" exported="" />
+    <orderEntryProperties />
+  </component>
+  <component name="WebModuleBuildComponent">
+    <setting name="EXPLODED_URL" value="file://" />
+    <setting name="EXPLODED_ENABLED" value="false" />
+    <setting name="JAR_URL" value="file://" />
+    <setting name="JAR_ENABLED" value="false" />
+    <setting name="SYNC_EXPLODED_DIR" value="true" />
+    <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
+    <setting name="RUN_JASPER_VALIDATION" value="false" />
+  </component>
+  <component name="WebModuleProperties">
+    <containerElement type="module" name="Messenger">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/classes" />
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/ant-contrib.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/ant-contrib.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/ant-subdirtask.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/ant-subdirtask.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/ant.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/ant.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-el.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/commons-el.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/activation.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/dist/activation.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/mail.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/dist/mail.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/jasper-compiler.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/jasper-runtime.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/jasper-runtime.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/junit.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/jdic.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/merge/jdic.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/jmdns.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/merge/jmdns.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/standard.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/merge/standard.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/xmltask.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/xmltask.jar!/</url>
+    </containerElement>
+    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/web/WEB-INF/web.xml" version="2.3" />
+    <webroots>
+      <root url="file://$MODULE_DIR$/src/web" relative="/" />
+      <root url="file://$MODULE_DIR$/src/web/WEB-INF" relative="/WEB-INF" />
+    </webroots>
+  </component>
+  <component name="WeblogicWebModuleProperties">
+    <option name="IS_RUN_APPC" value="false" />
+  </component>
+</module>
+

fixingTLS/Messenger.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <exclude-output />
+    <exclude-exploded />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/i18n" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <content url="jar://C:/Program Files/Java/jdk1.5.0_04/src.zip!/" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/ant-contrib.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/jstl.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/jaxen.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/commons-el.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/whack.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../whack/source/java" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/jasper-compiler.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/ant-subdirtask.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/commons-logging.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/dist/hsqldb.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/xmltask.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/xpp3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://C:/java/xpp3-1.1.3.4.M/src/java/api" />
+          <root url="file://C:/java/xpp3-1.1.3.4.M/src/java/mxp1_min" />
+          <root url="file://C:/java/xpp3-1.1.3.4.M/src/java/wrapper" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/dist/servlet.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/junit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/jdic.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/jmdns.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/dom4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://C:/java/dom4j 1.5.2/src/java" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/jasper-runtime.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/ant.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/dist/mysql.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/standard.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/dist/activation.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/jetty.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/dist/mail.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/dist/postgres.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/src/resources/jar" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/build/lib/merge/shaj.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

fixingTLS/Plugins.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target/plugins-dev" />
+    <exclude-output />
+    <exclude-exploded />
+    <content url="file://$MODULE_DIR$/src/plugins">
+      <sourceFolder url="file://$MODULE_DIR$/src/plugins/broadcast/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/plugins/presence/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/plugins/registration/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/plugins/search/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/plugins/userImportExport/src/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Messenger" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/plugins/userImportExport/lib/xsdlib.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/plugins/userImportExport/lib/msv.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/plugins/userImportExport/lib/relaxngDatatype.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/plugins/userImportExport/lib/isorelax.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

fixingTLS/build/build.properties.template

+#
+# $RCSfile$
+# $Revision$
+# $Date$
+#
+
+#
+# Directory where the jar files will be deployed (see the deployjar task)
+#
+deploy.jar.dir=
+
+#
+# Directory where plugin development is done. This is assumed to be the
+# root directory:
+#
+# /home/joeuser/java/myplugins/          <- Point to this directory
+#                       |- fooplugin/
+#                       |- barplugin/
+#
+plugin.dev.dir=
+
+#
+# Path to your Install4j installation. Typically this is c:\Program Files\install4j
+# This property is set by default in the build.xml file as c:\Program Files\install4j so
+# if you used the standard location you won't need to edit the property below.
+#
+# installer.install4j.home=
\ No newline at end of file

fixingTLS/build/lib/versions.txt

+Name                 |  Version
+---------------------------------------------
+hsqldb.jar           | 1.8.0.1
+mysql.jar            | 3.1.10
+postgres.jar         | 7.4 version 215
+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.2
+jasper-compiler.jar  | Jetty 5.1.2pre0
+jasper-runtime.jar   | Jetty 5.1.2pre0
+servlet.jar          | Jetty 5.1.2pre0
+dom4j.jar            | 1.6.1
+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.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
+xpp3.jar             | XPP_3 1.1.3.4.M
+whack.jar            | April-26-2005
+jmdns.jar            | 1.0 RC1
+shaj.jar             | 0.5
\ No newline at end of file

fixingTLS/build/resin/resin.conf.template

+<!--
+ - $RCSfile$
+ - $Revision$
+ - $Date$
+-->
+
+<!-- Resin 3.1.10+ configuration file for Jive Messenger site. Precondition: run 'ant jar'. -->
+
+<resin xmlns="http://caucho.com/ns/resin" xmlns:resin="http://caucho.com/ns/resin/core">
+
+   <!-- Path to the messenger cvs project -->
+   <system-property root="XXX EDIT THIS PATH XXX"/>
+   <system-property target="${root}\target"/>
+   <system-property messengerHome="${target}"/>
+
+   <log name="" level="info" path="stdout:" timestamp="%H:%M:%S "/>
+   <log name="com.caucho.java" level="config" path="stdout:" timestamp="%H:%M:%S "/>
+   <log name="com.caucho.loader" level="config" path="stdout:" timestamp="%H:%M:%S "/>
+
+   <server>
+
+       <http port="8080"/>
+
+       <host-default>
+
+           <class-loader>
+               <library-loader path="${target}/lib"/>
+           </class-loader>
+
+           <!-- Access logs if you want them -->
+           <!--
+           <access-log path="stdout:"
+               format="%h %l %u %t &quot;%r&quot; %s %b &quot;%{Referer}i&quot; &quot;%{User-Agent}i&quot;"
+               rollover-period="1W"/>
+           -->
+
+       </host-default>
+
+       <resin:import path="${resinHome}/conf/app-default.xml"/>
+
+       <!-- configures the default host, matching any host name -->
+       <host id="">
+
+           <!-- MESSENGER webapp -->
+           <web-app id="/messenger"
+                   document-directory="${root}/src/web"
+                   startup-mode="lazy"
+                   temp-dir="${root}/src/web/WEB-INF/tmp"
+                   work-dir="${root}/src/web/WEB-INF/work"
+           >
+               <path-mapping url-pattern="/WEB-INF/*" real-path="${root}/src/web/WEB-INF"/>
+           </web-app>
+       </host>
+   </server>
+
+</resin>

fixingTLS/documentation/dist/README.html

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>Jive Messenger Readme</title>
+    <style type="text/css">
+        BODY {
+            font-size : 100%;
+        }
+        BODY, TD, TH {
+            font-family : tahoma, verdana, arial, helvetica, sans-serif;
+            font-size : 0.8em;
+        }
+        A:hover {
+            text-decoration : none;
+        }
+        .pageheader {
+            font-family : arial, helvetica, sans-serif;
+            font-size : 14pt;
+            font-weight: bold;
+        }
+        .header {
+            font-family : tahoma, arial, helvetica, sans-serif;
+            font-size : 1.4em;
+            font-weight: bold;
+            border-bottom : 1px #ccc solid;
+            padding-bottom : 2px;
+        }
+        .subheader {
+            font-weight: bold;
+            color: #600;
+        }
+        TT {
+            font-family : courier new;
+            font-weight : bold;
+            color : #060;
+        }
+        PRE {
+            font-family : courier new;
+            font-size : 100%;
+        }
+        .footer {
+            font-size : 0.8em;
+            color : #666;
+            text-align : center;
+        }
+    </style>
+</head>
+<body>
+
+<div class="header">
+Jive Messenger Readme
+</div>
+
+<p>
+<table boder=0>
+<tr>
+	<td>version:</td>
+	<td><b>@version@</b></td>
+</tr><tr>
+	<td>released:</td>
+	<td><b>@builddate@</b></td>
+</tr>
+</table>
+
+<p>
+Thank you for downloading Jive Messenger!
+<p>
+Jive Messenger is an instant messaging (IM) and groupchat server that uses the
+XMPP protocol. Start off by viewing the <a href="documentation/index.html">documentation</a>
+that can be found in the "documentation" directory included with this distribution.
+<p>
+Further information can be found on the <a href="http://www.jivesoftware.org/messenger">
+Jive Messenger website</a>.
+ 
+<p><b>Changelog</b><p>
+
+View the <a href="changelog.html">changelog</a> for a list of changes since the 
+last release.
+
+<p><b>Support</b><p>
+
+Free support is provided by the Jive Messenger community in the 
+<a href="http://www.jivesoftware.org/forums">online forums</a>. Commercial
+support (email and phone) from Jive Software is 
+<a href="http://www.jivesoftware.com/products/messenger">also available</a>.
+
+<p><b>License Agreements</b><p>
+
+The Jive Messenger source code is governed by the GNU Public License (GPL), which
+can be found in the <a href="LICENSE.html">LICENSE.html</a> file in this distribution.
+Jive Messenger also contains Open Source software from third-parties.
+Licensing terms for those components is specifically noted in the relevant source
+files.<p>
+
+Jive Messenger contains icons and images licensed from INCORS GmbH. All other
+images are owned by Jive Software. All icons and images in Jive Messenger
+are provided under the following license agreement:
+<pre>
+License Agreement
+
+This is a legal agreement between You, the User of the Jive Messenger application
+(“The Software”), and Jive Software ("Jive Software"). By downloading the Software,
+you agree to be bound by the terms of this agreement.
+
+All ownership and copyright of the images and icons included in the Software
+distribution remain the property of Jive Software and INCORS GmbH. Jive Software
+grants to you a nonexclusive, non-sublicensable right to use the icons royalty-free
+as part of Jive Messenger.
+
+You may not lease, license or sub-license the icons, or a subset of the icons,
+or any modified icons to any third party. You may not incorporate them into your
+own software or design products.
+
+All icon files are provided "As is" without warranties of merchantability and
+fitness for a particular purpose. You agree to hold Jive Software harmless for
+any result that may occur during the course of using the licensed icons.
+
+This License Agreement shall be governed and construed in accordance with the
+laws of Oregon. If any provision of this License Agreement is held to be
+unenforceable, this License Agreement will remain in effect with the provision
+omitted.
+</pre>
+
+</body>
+</html>

fixingTLS/documentation/docs/index.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+    <title>Messenger: Overview - Jive Software</title>
+    <link type="text/css" rel="stylesheet" href="style.css">
+</head>
+
+<body> 
+
+<h1>Jive Messenger @version@</h1>
+
+<p>
+Jive Messenger provides comprehensive group chat and instant
+messaging (IM) services using the XMPP protocol.
+</p>
+
+<p><b>Documentation:</b></p>
+
+<ul>
+    <li>
+        <a href="install-guide.html">Installation Guide</a> -
+        How to install Jive Messenger.
+    </li>
+    <li>
+        <a href="database.html">Database Installation Guide</a> - 
+        How to setup your database for use with Jive Messenger.
+    </li>
+    <li>
+        <a href="ssl-guide.html">SSL Guide</a> - 
+        A guide to setting up Messenger's SSL secure socket support.
+    </li>
+    <li>
+        <a href="ldap-guide.html">LDAP Guide</a> - 
+        A guide to setting up Jive Messenger to work with LDAP user stores.
+    </li>
+</ul>
+
+<p><b>Developer Documentation:</b></p>
+
+<ul>
+	 <li>
+        <a href="javadoc/index.html">JavaDocs</a> -
+        Jive Messenger API documentation.
+    </li>
+    <li>
+        <a href="source-build.html">Building the Source</a> -
+        Instructions for downloading and compiling the Jive Messenger source code.
+    </li>
+    <li>
+        <a href="protocol-support.html">Protocol Support</a> -
+        Provides details on the XMPP support and JEPs that Jive Messenger implements.
+    </li>
+	   <li>
+        <a href="plugin-dev-guide.html">Plugin Developer Guide</a> -
+        A guide to writing and installing plugins for Jive Messenger.
+    </li>
+    <li>
+        <a href="translator-guide.html">Translator Guide</a> -
+        Information for those interested in translating the admin console of Jive Messenger into other languages.
+    </li>
+    <li>
+        <a href="database-guide.html">Database Schema Guide</a> -
+        A tour of the Jive Messenger database schema for developers and database administrators.
+    </li>
+</ul>
+
+<p>
+An active support community for Jive Messenger is available at 
+<a href="http://www.jivesoftware.org/forums/">http://www.jivesoftware.org/forums/</a>.
+</p>
+
+</body>
+</html>

fixingTLS/documentation/docs/install-guide.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>Jive Software Messenger Readme</title>
+  <link href="style.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+<h1>Jive Messenger Installation Guide</h1>
+
+<p>Jive Messenger is a powerful instant messaging (IM) and chat
+server that implements the XMPP protocol. This document will guide 
+you through installing Jive Messenger as a standalone
+application. For a full list of features and more information, please
+visit the Jive Messenger website: <a href="http://www.jivesoftware.org/messenger"
+ target="_top">http://www.jivesoftware.org/messenger</a></p>
+
+<h2>Installation</h2>
+<ul>
+<h3>Windows</h3>
+Run the Jive Messenger installer. The application will be installed to <tt>c:\Program Files\Jive Messenger</tt> by default.
+ 
+ <h3>Linux/Unix</h3>
+ 
+ Choose either the RPM or tar.gz build. If using the RPM, run it using your package manager to install Jive Messenger to <tt>/opt/jive_messenger</tt>:
+
+ <p><tt>rpm -ivh jive_messenger_2_1_2.rpm</tt></p>
+ 
+ If using the .tar.gz, extract the archive to <tt>/opt</tt> or <tt>/usr/bin</tt>:
+
+ <p><tt>tar -xzvf jive_messenger_2_1_2.tar.gz<br>
+ mv jive_messenger /opt</tt></p>
+
+ <p><b>Note:</b> the .tar.gz build does not contain a bundled Java runtime (JRE). Therefore, you must have JDK or JRE 1.5.0 (Java 5) or later installed on your system. You can check your java version by typing "java -version" at the command line and (if necessary) upgrade your Java installation by visiting http://java.sun.com.</p>
+
+  </ul>
+<h2>Setup Overview</h2>
+<p>To complete the installation of Jive Messenger, you'll need to
+perform each of the following steps: </p>
+<ol>
+  <li><a href="#database">Database</a> - if you choose to use an external database, you must
+ prepare your database for Jive Messenger. </li>
+  <li><a href="#config">Setup</a> - Use the built-in web-based setup
+tool to setup and verify the server configuration.</li>
+  <li><a href="#tools">Admin Console</a> - use the web-based admin tool to
+manage the server.</li>
+</ol>
+
+<p>This document also includes information on:</p>
+
+<ul>
+    <li><a href="#windows">Running under Windows</a>
+    <li><a href="#unix">Running under Unix/Linux</a>
+    <li><a href="#plugins">Installing and using plugins</a>
+</ul>
+
+<h2><a name="distribution">Files in the Distribution</a></h2>
+<p> The files in your distribution should be as follows (some
+sub-directories omitted for brevity): </p>
+<pre>jive_messenger/  
+ |- readme.html
+ |- license.html
+ |- conf/
+ |- bin/
+ |- jre/
+ |- lib/
+ |- plugins/
+     |- admin/
+ |- resources/
+     |-database/
+     |-security/
+ |- documentation/</pre>
+
+<ul> 
+	 <li>The <tt>conf</tt> directory is where Jive Messenger stores
+configuration files.</li>
+  <li>The <tt>bin</tt> directory contains the server executables. Depending
+on which distribution you installed, different executables will be available.</li>
+  <li>The <tt>jre</tt> directory contains a Java 5 runtime that is bundled with the Windows and RPM versions of Jive Messenger.</li>
+  <li>The <tt>lib</tt> directory contains libraries necessary for
+running Jive Messenger.</li>
+  <li>The <tt>plugins</tt> directory contains server plugins. By
+default, Jive Messenger ships with a web-based admin console plugin.</li>
+  <li>The <tt>resources/database</tt> directory contains SQL schema files to
+create new Jive Messenger databases, as well as upgrade scripts for
+existing installations. </li>
+  <li>The <tt>resources/security</tt> directory is where Jive Messenger
+maintains keystores to support SSL connection security.</li>
+  <li>The <tt>documentation</tt> directory contains server
+documentation.</li>
+</ul><p>
+
+<h2><a name="database">Setup the Database</a></h2>
+<p> <a>Jive Messenger can store its data in an embedded database or you can choose to use
+an external database such as MySQL or Oracle. If you would like to use an external database,
+you must prepare it before proceeding with installation by running the appropriate database
+schema. View the </a><a href="database.html">database
+setup</a> documentation for more information.</p>
+
+</p>
+<h2><a name="config"></a>Setup the Server</h2>
+<p>A web-based, "wizard" driven setup and configuration tool is built
+into Jive Messenger. Simply launch Jive Messenger (platform-specific instructions below) and use a web browser to
+connect to the admin console. The default port for the
+web-based admin console is 9090. If you are on the same machine as Messenger, the
+following URL will usually work: 
+<a href="http://127.0.0.1:9090">http://127.0.0.1:9090</a>.</p>
+
+<h2><a name="tools">Admin Console</a></h2>
+<p>After completing the above steps, Messenger will be configured
+and you can use the web-based admin console to administer
+the server. The URL should be the same as you used to setup the server
+unless you changed the port during the setup.<br>
+</p>
+
+<hr>
+
+<h2><a name="windows">Running Jive Messenger in Windows</a></h2>
+
+<p>If you used the Jive Messenger installer, a shortcut for starting the
+a graphical launcher is provided in your Start Menu. Otherwise, run messenger.exe in the <tt>bin/</tt> directory of your
+Jive Messenger installation. A button on the on the launcher allows 
+you to automatically open your web browser to the correct URL to finish 
+setting up the server: 
+
+<p>
+<div align="center">
+<img src="images/launcher.png" alt="Jive Messenger Launcher" width="323" height="277" align="center">
+</div>
+</p>
+
+<h3>Windows Service</h3>
+<p>If you're running Messenger on Windows, you will likely want to
+run Messenger as a standard Windows service after initial setup.
+If you used the Windows installer, a <tt>messenger-service.exe</tt> file
+will be in the <tt>bin</tt> directory of the installation. You can use
+this executable to install and control the Jive Messenger service.
+</p>
+
+From a console window, you can run the following commands:
+<ul>
+		<li><tt>messenger-service /install</tt> -- installs the service.
+		<li><tt>messenger-service /uninstall</tt> -- uninstalls the service.
+		<li><tt>messenger-service /start</tt> -- starts the service
+		<li><tt>messenger-service /stop</tt> -- stops the service.
+</ul>
+
+<p>
+<div align="center">
+<img src="images/windows_service.png" alt="Windows Service" width="557" height="223" align="center">
+</div>
+</p>
+
+<p>You can also use the Services tool in the Windows Control Panel to start and
+stop the service.</p>
+
+<p>Note: the graphical launcher is not compatible with the Windows service
+at this time. If you install the service, you should use service controls
+as described above to control the server rather than the graphical launcher.</p>
+
+<h3>Custom Parameters</h3>
+
+<p>Advanced users may wish to pass in parameters to the Java virtual machine (VM) to customize the runtime environment of Jive Messenger. You can do this by creating vmoptions files in the bin/ directory of your Jive Messenger installation. For the Windows service, you'd create a new text file called messenger-service.exe.vmoptions. Each parameter to the VM should be on a new line of the file. For example, to set the minimum and max VM heap size to 256 MB, you'd use:
+
+<pre>-Xms256m
+-Xmx256m</pre>
+
+To create parameters for the normal launcher, create a file called messengerd.exe.vmoptions (since the messenger.exe launcher invokes the messengerd.exe executable to actually start the server).</p>
+
+<h2><a name="unix">Running Jive Messenger in Linux/Unix</a></h2>
+
+You can start and stop Jive Messenger using the <tt>bin/messenger</tt> script in your Jive messenger installation:
+
+<p>
+<tt>
+# ./messenger<br>
+Usage: ./messenger {start|stop}<br>
+# ./messenger start<br>
+Starting messenger
+</tt></p>
+
+If you would like to install Jive Messenger as a service, two scripts are provided in the <tt>bin/extra</tt>
+directory:
+<ul>
+    <li>redhat-postinstall.sh -- automatically installs Jive Messenger as a service on Red Hat. It does so by creating a "jive" user and then copying the jive-messengerd script to your init.d directory. This script must be run as root. Please see the comments in the script for additional information.</li>
+    <li>jive-messengerd -- script to run Jive Messenger as a service. You must manually configure this script. See the comments in
+the script for additional details.</li>
+</ul>
+
+<h2><a name="plugins">Plugins</a></h2>
+
+Plugins add additional features and protocol support to Jive Messenger. After setting up your
+Jive Messenger installation, you may want to download and install plugins to enhance your
+server. Plugins can be downloaded from the
+<a href="http://www.jivesoftware.org/messenger/plugins.jsp">plugins page</a> on jivesoftware.org.
+
+<h3>Installing Plugins</h3>
+
+Each plugin comes packaged as a .jar (JAR) file. After download the plugin, you can deploy it
+by copying the plugin file to the <tt>plugins/</tt> directory of your Jive Messenger installation. A
+plugin monitor will automatically extract the plugin into a directory and install the plugin in Jive Messenger.
+
+
+<h3>Managing Plugins</h3>
+
+Plugins can be managed inside the Jive Messenger admin console. You can also manually delete a plugin at any time by 
+deleting its JAR file (Jive Messenger will automatically remove the plugin from memory and delete it's directory when you
+do so).
+
+</body>
+</html>

fixingTLS/documentation/docs/licenses/LICENSE-commons-logging.txt

+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */

fixingTLS/documentation/docs/licenses/LICENSE-dom4j.txt

+/*
+ $Id$
+
+ Copyright 2001-2004 (C) MetaStuff, Ltd. All Rights Reserved.
+ 
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+    statements and notices.  Redistributions must also contain a
+    copy of this document.
+ 
+ 2. Redistributions in binary form must reproduce the
+    above copyright notice, this list of conditions and the
+    following disclaimer in the documentation and/or other
+    materials provided with the distribution.
+ 
+ 3. The name "DOM4J" must not be used to endorse or promote
+    products derived from this Software without prior written
+    permission of MetaStuff, Ltd.  For written permission,
+    please contact dom4j-info@metastuff.com.
+ 
+ 4. Products derived from this Software may not be called "DOM4J"
+    nor may "DOM4J" appear in their names without prior written
+    permission of MetaStuff, Ltd. DOM4J is a registered
+    trademark of MetaStuff, Ltd.
+ 
+ 5. Due credit should be given to the DOM4J Project - 
+    http://www.dom4j.org
+ 
+ THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ */