Updates for 2.1.1 release.

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

build/build.xml

@@ -88,7 +88,7 @@
     <property name="release.dest.dir" value="${target.dir}/release" />
     <property name="version.major" value="2" />
     <property name="version.minor" value="1" />
-    <property name="version.revision" value="0" />
+    <property name="version.revision" value="1" />
     <property name="version.extra" value="" />
     <property name="dist.prefix" value="jive_messenger" />
     <property name="overwrite" value="false" />
@@ -474,7 +474,7 @@
 
         <!-- Copy bin dir -->
         <copy todir="${prepare.out.dir}">
-            <fileset dir="${src.dir}" includes="bin/*.*" />
+            <fileset dir="${src.dir}" includes="bin/**/*" />
         </copy>
         <fixcrlf srcdir="${prepare.out.dir}/bin" eol="lf" eof="remove" includes="*.sh" />
 

build/installer/messenger.install4j

 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="3.1.2">
   <directoryPresets config="C:/Documents and Settings/Matt/Desktop" />
-  <application name="Jive Messenger" distributionSourceDir="" applicationId="6886-9911-0474-3571" mediaDir="../../target/release" mediaFilePattern="%SHORT_NAME%_%VERSION%" compression="9" shortName="jive_messenger" publisher="Jive Software" publisherWeb="http://www.jivesoftware.org" version="2.1.0" allPathsRelative="true" backupOnSave="false" autoSave="true" javaMinVersion="1.5" javaMaxVersion="" allowBetaVM="false">
+  <application name="Jive Messenger" distributionSourceDir="" applicationId="6886-9911-0474-3571" mediaDir="../../target/release" mediaFilePattern="%SHORT_NAME%_%VERSION%" compression="9" shortName="jive_messenger" publisher="Jive Software" publisherWeb="http://www.jivesoftware.org" version="2.1.1" allPathsRelative="true" backupOnSave="false" autoSave="true" javaMinVersion="1.5" javaMaxVersion="" allowBetaVM="false">
     <searchSequence>
       <registry />
       <envVar name="JAVA_HOME" />
       <envVar name="JDK_HOME" />
     </searchSequence>
     <variables>
-      <variable name="RELEASE_DIR" value="jive_messenger_2_1_0" />
+      <variable name="RELEASE_DIR" value="jive_messenger_2_1_1" />
     </variables>
   </application>
   <files>
@@ -152,6 +152,7 @@
       </selectedLaunchers>
       <messageSet language="English" />
       <exclude>
+        <entry location="bin/extra" launcher="false" />
         <entry location="bin/messenger.bat" launcher="false" />
         <entry location="bin/messenger.sh" launcher="false" />
       </exclude>
@@ -173,6 +174,18 @@
       <variables />
       <customScriptLines />
     </linuxRPM>
+    <unixArchive name="Unix Archive" id="30" mediaFileName="" installDir="jive_messenger" allLaunchers="false" includedJRE="linux-x86-1.5.0" manualJREEntry="false" customScriptMode="1" customScriptFile="">
+      <selectedLaunchers>
+        <launcher id="22" />
+      </selectedLaunchers>
+      <messageSet language="English" />
+      <exclude>
+        <entry location="bin/messenger.bat" launcher="false" />
+        <entry location="bin/messenger.sh" launcher="false" />
+      </exclude>
+      <variables />
+      <customScriptLines />
+    </unixArchive>
   </mediaSets>
   <buildIds buildAll="true">
     <mediaSet refId="18" />

documentation/dist/changelog.html

@@ -68,6 +68,37 @@
 Jive Messenger Changelog
 </div>
 
+<p>
+<b>2.1.1</b> -- January 30, 2005
+<p>
+<h2>New Features</h2>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-103'>JM-103</a>] - Added support for Delayed Delivery (JEP-0091)</li>
+</ul>
+
+<h2>Bug Fixes</h2>
+<ul>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-12'>JM-12</a>] - Don't display shutdown message by default</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-57'>JM-57</a>] - Fixed web.xml generation during build process.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-72'>JM-72</a>] - Added caching to offline message storage operations.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-120'>JM-120</a>] - Shut down embedded database at end of setup.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-124'>JM-124</a>] - Fixed exception using upper-case usernames to login.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-128'>JM-128</a>] - Marking users as group admins now works.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-131'>JM-131</a>] - Pagination now works on group pages.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-134'>JM-134</a>] - Fixed Exception when sorting users on the user summary page.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-136'>JM-136</a>] - Search result bug fixed.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-137'>JM-137</a>] - Updated the multicast DNS name.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-138'>JM-138</a>] - Refactored IQ Handler to make it more usable by plugins.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-139'>JM-139</a>] - Auditor file now uses UTF-8 as the character encoding.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-140'>JM-140</a>] - Initial presence was not being sent after connecting the same user from many resources.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-141'>JM-141</a>] - Fixed minor problems in group edit page.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-142'>JM-142</a>] - Incorrect items were being added to the roster when using shared groups</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-144'>JM-144</a>] - Fixed DB2 Schema issues.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-143'>JM-143</a>] - Bug fixes and new features in the shared groups feature.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-132'>JM-132</a>] - Results from LDAP are now sorted when the LDAP server supports it.</li>
+<li>[<a href='http://www.jivesoftware.org/issues/browse/JM-135'>JM-135</a>] - Packet extensions now kept with group chat room invitations.</li>
+</ul>
+
 <p>
 <b>2.1.0</b> -- January 15, 2005
 <p>

documentation/docs/database.html

@@ -7,7 +7,8 @@
 <body>
 <h1><a name="introduction">Jive Messenger Database Setup</a></h1>
 
-<p>Jive Messenger stores all data in a back-end database that you must setup and manage.
+<p>Jive Messenger stores all data in a back-end database. If you choose to not use the embedded
+database, you must setup and manage an external database for the application.
 This document provides setup instructions for all of the currently supported databases.
 </p>
 <p>

documentation/docs/index.html

@@ -20,8 +20,7 @@ messaging (IM) services using the XMPP protocol.
 <ul>
     <li>
         <a href="install-guide.html">Installation Guide</a> -
-        How to install Jive Messenger as a standalone application or into
-        an existing application server.
+        How to install Jive Messenger.
     </li>
     <li>
         <a href="database.html">Database Installation Guide</a> - 

documentation/docs/install-guide.html

@@ -14,26 +14,30 @@ 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>
 
-<p>In order to install Jive Messenger, you'll need a server environment
-that meets the following requirements: </p>
+<h2>Installation</h2>
 <ul>
-  <li><b>JDK 1.5.0</b> (Java 5) or later. Java 5 is bundled with the 
-platform-specific Jive Messenger installers. If you are using the ".zip" or ".tar.gz" 
-distribution, you can check your java version by typing "java -version" at the 
-command line and (if necessary) upgrade your Java installation by visiting 
-<a href="http://java.sun.com">http://java.sun.com</a>.</li>
-  <li>A supported database with a robust JDBC driver, or you can
-choose to use the embedded database during the setup process. Supported 
-databases and recommended JDBC drivers are detailed in the database 
-documentation below.</li>
-</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 .tar.gz, extract the archive to <tt>/opt</tt> or <tt>/usr/bin</tt>:
+
+ <p><tt>tar -xzvf jive_messenger_2_1_1.tar.gz<br>
+ mv jive_messenger /opt</tt></p>
+
+ If using the RPM, run it using your package manager:
+
+ <p><tt>rpm -ivh jive_messenger_2_1_1.rpm</tt></p>
 
-<h2>Installation Overview</h2>
+ which will install Jive Messenger in /opt/jive_messenger.<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> - prepare your database for Jive
-Messenger. </li>
+  <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
@@ -47,6 +51,7 @@ sub-directories omitted for brevity): </p>
  |- license.html
  |- conf/
  |- bin/
+ |- jre/
  |- lib/
  |- plugins/
      |- admin/
@@ -60,6 +65,7 @@ sub-directories omitted for brevity): </p>
 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 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
@@ -74,27 +80,35 @@ documentation.</li>
 </ul><p>
 
 <h2><a name="database">Setup the Database</a></h2>
-<p> <a>Jive Messenger uses a database to store it's data. To setup
-your database you must load the appropriate database schema. You can find
-schemas in the <tt>resources/database</tt> directory of this distribution. View
-the </a><a href="database.html">database
-setup</a> documentation to learn how to install the schemas and JDBC
-drivers. Alternatively, you can select the embedded database during
-the setup process.</p>
-<p>Complete the database steps outlined in the database setup
-documentation before proceeding further.<br>
+<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 and use a web browser to
+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>Running Jive Messenger in Windows</h2>
+
 <p>If you used the Jive Messenger installer, a shortcut for starting the
-a graphical launcher is provided. A button on the on the launcher allows 
+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: 
 
@@ -104,7 +118,6 @@ setting up the server:
 </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.
@@ -134,6 +147,26 @@ stop the service.</p>
 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> 
 
+<h2>Running Jive Messenger in Linux/Unix</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>   
 
 <!--
 <h3>Solaris/Linux/MacOS X Deployment</h3>
@@ -171,12 +204,5 @@ restart Messenger automatically
 ensuring that Messenger continues to be available to users.</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>
-
 </body>
 </html>