Tagging 3.7.0 Beta Release

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/tags/openfire_3_7_0_beta@11850 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -137,7 +137,7 @@
     <property name="copy.dbscripts" value="true"/>
     <property name="overwrite" value="true"/>
 
-    <property name="installer.install4j.home" value="c:\\Program Files\\install4j"/>
+    <property name="installer.install4j.home" value="/home/j2ee-bamboo/install4j.4.0.5"/>
     <property name="installer.src" value="${basedir}/build/installer"/>
     <property name="installer.dest.dir" value="${release.dest.dir}"/>
     <property name="installer.install4j.srcfile" value="${installer.src}/openfire.install4j"/>
@@ -147,7 +147,7 @@
     <property name="installer.application_id" value="6886-9911-0474-3571"/>
     <property name="installer.unix_install_dir" value="openfire"/>
     <property name="installer.windows_install_dir" value="Openfire"/>
-    <property name="installer.publisher" value="Jive Software"/>
+    <property name="installer.publisher" value="Ignite Realtime RTC Community"/>
     <property name="installer.publisher_url" value="www.igniterealtime.org"/>
     <property name="installer.file_prefix" value="${installer.app_short_name}"/>
     <property name="installer.release_root_path" value="${release.dest.dir}"/>
@@ -225,6 +225,7 @@
                 <or>
                     <contains string="${ant.version}" substring="1.6"/>
                     <contains string="${ant.version}" substring="1.7"/>
+                    <contains string="${ant.version}" substring="1.8"/>
                 </or>
             </not>
         </condition>
@@ -621,7 +622,7 @@
                 <pathelement path="${test.classes.dest.dir}"/>
             </classpath>
 
-            <formatter type="plain"/>
+            <formatter type="xml"/>
 
             <batchtest todir="${test.results.dest.dir}">
                 <fileset dir="${src.test.java.dir}">
@@ -1754,7 +1755,7 @@
             <replacefilter token="%COPYRIGHT%" value="${copyrightyear}"/>
         </replace>
         <copy todir="${target.osx}" file="${basedir}/build/osx/Description.plist"/>
-        <exec executable="/Developer/Tools/packagemaker">
+        <exec executable="/Developer/usr/bin/packagemaker">
             <arg value="-build"/>
             <arg value="-f"/>
             <arg value="${mac.pkg.dir}"/>
@@ -1781,6 +1782,7 @@
         <exec executable="hdiutil" failonerror="true">
             <arg line="attach '${target.osx}/tmp.dmg' -readwrite -noverify -noautoopen -noidme -mountpoint '${mac.dmg.dir}'"/>
         </exec>
+<!-- OF-386 - commented out since it wasn't working with our Bamboo remote agent // TODO: fix it
         <exec executable="osascript" dir="${basedir}/build/osx/" failonerror="true">
             <arg value="dmg_openfire.scpt"/>
             <arg value="Openfire"/>
@@ -1791,6 +1793,7 @@
             <arg value="220"/>
             <arg value="128"/>
         </exec>
+-->
         <exec executable="hdiutil" failonerror="true">
             <arg line="detach ${mac.dmg.dir} -quiet -force"/>
         </exec>

build/installer/openfire.install4j

@@ -22,12 +22,12 @@
     </searchSequence>
     <variables>
       <variable name="VERSION_MAJOR" value="3" />
-      <variable name="VERSION_MINOR" value="6" />
-      <variable name="VERSION_REVISION" value="5" />
+      <variable name="VERSION_MINOR" value="7" />
+      <variable name="VERSION_REVISION" value="0" />
       <variable name="APP_NAME" value="Openfire" />
       <variable name="APP_SHORT_NAME" value="openfire" />
       <variable name="PRODUCT_NAME" value="openfire" />
-      <variable name="PUBLISHER" value="Jive Software" />
+      <variable name="PUBLISHER" value="Ignite Realtime RTC Community" />
       <variable name="PUBLISHER_URL" value="www.igniterealtime.org" />
       <variable name="RELEASE_DIR" value="openfire" />
       <variable name="RELEASE_ROOT_PATH" value="..\..\target\release" />
@@ -71,7 +71,7 @@
           <versionLine x="20" y="40" text="version ${compiler:sys.version}" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
         </text>
       </splashScreen>
-      <java mainClass="org.jivesoftware.openfire.starter.ServerStarter" vmParameters="" arguments="" allowVMPassthroughParameters="true" preferredVM="server">
+      <java mainClass="org.jivesoftware.openfire.starter.ServerStarter" vmParameters="-DopenfireHome=&quot;${launcher:sys.launcherDirectory}../&quot;" arguments="" allowVMPassthroughParameters="true" preferredVM="server">
         <classPath>
           <scanDirectory location="lib" failOnError="false" />
         </classPath>
@@ -93,7 +93,7 @@
           <versionLine x="20" y="40" text="version ${compiler:sys.version}" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
         </text>
       </splashScreen>
-      <java mainClass="org.jivesoftware.openfire.launcher.Launcher" vmParameters="&quot;-Dappdir=${launcher:sys.launcherDirectory}&quot;" arguments="" allowVMPassthroughParameters="true" preferredVM="">
+      <java mainClass="org.jivesoftware.openfire.launcher.Launcher" vmParameters="-Dappdir=&quot;${launcher:sys.launcherDirectory}&quot; -DopenfireHome=&quot;${launcher:sys.launcherDirectory}../&quot;" arguments="" allowVMPassthroughParameters="true" preferredVM="">
         <classPath>
           <scanDirectory location="lib" failOnError="false" />
         </classPath>
@@ -115,7 +115,7 @@
           <versionLine x="20" y="40" text="version ${compiler:sys.version}" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
         </text>
       </splashScreen>
-      <java mainClass="org.jivesoftware.openfire.starter.ServerStarter" vmParameters="" arguments="" allowVMPassthroughParameters="true" preferredVM="server">
+      <java mainClass="org.jivesoftware.openfire.starter.ServerStarter" vmParameters="-DopenfireHome=&quot;${launcher:sys.launcherDirectory}../&quot;" arguments="" allowVMPassthroughParameters="true" preferredVM="server">
         <classPath>
           <scanDirectory location="lib" failOnError="false" />
         </classPath>
@@ -137,7 +137,7 @@
           <versionLine x="20" y="40" text="version ${compiler:sys.version}" font="Arial" fontSize="8" fontColor="0,0,0" fontWeight="500" />
         </text>
       </splashScreen>
-      <java mainClass="org.jivesoftware.openfire.starter.ServerStarter" vmParameters="" arguments="-DopenfireHome=$app_home -Dopenfire.lib.dir=$app_home/lib" allowVMPassthroughParameters="true" preferredVM="server">
+      <java mainClass="org.jivesoftware.openfire.starter.ServerStarter" vmParameters="" arguments="-DopenfireHome=&quot;${launcher:sys.launcherDirectory}../&quot; -Dopenfire.lib.dir=&quot;$app_home/lib&quot;" allowVMPassthroughParameters="true" preferredVM="server">
         <classPath>
           <scanDirectory location="lib" failOnError="true" />
         </classPath>

build/lib/versions.txt

@@ -3,14 +3,15 @@ Name                                |  Version
 ant.jar                             | Jetty 6.1.0 (1.6.5)                                          | Apache 2.0
 ant-contrib.jar                     | 1.0b1                                                        | Apache 2.0
 ant-subdirtask.jar                  | Revision 1.4 (CVS)                                           |
-bouncycastle.jar                    | JDK 1.5, 139 (bcprov-jdk15-139.jar)                          | See http://www.bouncycastle.org/licence.html
+bouncycastle.jar                    | JDK 1.5, 145 (bcprov-jdk15-145.jar)                          | See http://www.bouncycastle.org/licence.html
 cglib.jar                           | 2.1.3 (JMock 2.1.0)                                          |
 commons-lang.jar                    | 2.3                                                          | Apache 2.0
 commons-logging.jar                 | Jetty 5.1.10                                                 | Apache 2.0
 commons-el.jar                      | Jetty 6.0.1 (1.0)                                            | Apache 2.0
 commons-httpclient.jar              | 3.1                                                          | Apache 2.0
 commons-codec.jar                   | 1.3                                                          | Apache 2.0
 dom4j.jar                           | 1.6.1                                                        | BSD (http://www.dom4j.org/dom4j-1.6.1/license.html)
+concurrentlinkedhashmap-lru         | concurrentlinkedhashmap-lru-1.0_jdk5                         | Apache 2.0
 dbutil.jar                          | Jive Code, no release version.                               | GPL
 hamcrest.jar                        | 1.0 (JMock 2.1.0)                                            | New BSD License
 hamcrest-api.jar                    | 1.0 (JMock 2.1.0)                                            | New BSD License
@@ -57,7 +58,7 @@ sitemesh.jar                        | 2.2.1
 slf4j-api                           | 1.5.8                                                        | http://www.slf4j.org/license.html
 slf4j-log4j12                       | 1.5.8                                                        | http://www.slf4j.org/license.html
 standard.jar                        | Jakarta standard taglib 1.1.2                                |
-tinder.jar                          | 1.2.1                                                        | Apache 2.0
+tinder.jar                          | 1.2.2                                                        | Apache 2.0
 xmltask.jar                         | 1.11                                                         | Apache 1.1
 xpp3.jar                            | XPP_3 1.1.4c                                                 | BSD (http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt)
 

build/osx/openfirePrefPane/openfirePrefPane.xcodeproj/project.pbxproj

@@ -57,7 +57,7 @@
 		32DBCFA20370C41700C91783 /* openfirePrefPane_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = openfirePrefPane_Prefix.pch; sourceTree = "<group>"; };
 		6305C7100BCEE09200D552C4 /* jivesoftware_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jivesoftware_logo.png; sourceTree = "<group>"; };
 		633BEA0A0B39DF03003AD355 /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = /System/Library/Frameworks/SecurityInterface.framework; sourceTree = "<absolute>"; };
-		633BEA760B39EB2B003AD355 /* HelperTool */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = HelperTool; sourceTree = BUILT_PRODUCTS_DIR; };
+		633BEA760B39EB2B003AD355 /* HelperTool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HelperTool; sourceTree = BUILT_PRODUCTS_DIR; };
 		633BEA790B39EB60003AD355 /* authTool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = authTool.c; sourceTree = "<group>"; };
 		633BEAAC0B39EEF8003AD355 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
 		63A50BAA0BB338EF009E9FD0 /* openfire-logo-notext.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "openfire-logo-notext.tif"; sourceTree = "<group>"; };
@@ -247,6 +247,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 65E2E72D0A5E8C0F00DFFC2E /* Build configuration list for PBXProject "openfirePrefPane" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 089C166AFE841209C02AAC07 /* openfirePrefPane */;
 			projectDirPath = "";
@@ -431,7 +432,6 @@
 				LIBRARY_SEARCH_PATHS = "";
 				LIBRARY_STYLE = Bundle;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-bundle",
@@ -454,6 +454,8 @@
 		65E2E72A0A5E8C0F00DFFC2E /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -466,6 +468,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = openfirePrefPane_Prefix.pch;
+				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
@@ -475,14 +478,14 @@
 				LIBRARY_SEARCH_PATHS = "";
 				LIBRARY_STYLE = Bundle;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-bundle",
 					"-twolevel_namespace",
 				);
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Openfire;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SECTORDER_FLAGS = "";
 				SYMROOT = "$(PROJECT_DIR)/build";
 				WARNING_CFLAGS = (
@@ -582,15 +585,22 @@
 		65E2E72E0A5E8C0F00DFFC2E /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_VERSION = 4.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Development;
 		};
 		65E2E72F0A5E8C0F00DFFC2E /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_VERSION = 4.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};

documentation/docs/database.html

@@ -117,23 +117,26 @@ <h2><a name="mysql">MySQL</a></h2>
 
 	<b>JDBC Drivers</b><p>
 
-	The Oracle 9i or 10g "thin" drivers are recommended and can be downloaded from 
-    <a href="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html">Oracle's website</a>. 
+	The Oracle 11g "thin" drivers are recommended and can be downloaded from 
+    <a href="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html
+	 ">Oracle's website</a>. 
 
-    Various versions of the thin drivers are avaialble, but the "ojdbc14.jar" driver is recommended for use with Openfire.
+    Various versions of the thin drivers are avaialble, but the most recent (11.2.0.1.0 or newer) driver is recommended for use with Openfire. Use "ojdbc5.jar" if you are using Java 1.5 or "ojdbc5.jar" if you are using Java 1.6.
     Copy the JDBC driver to the <tt>lib/</tt> directory of your Openfire installation.
 
 	<p>
 	In the Openfire web-based setup tool, use the following values:<p>
 
     <ul>
 		<li>driver: <tt>oracle.jdbc.driver.OracleDriver</tt>
-		<li>server: <tt>jdbc:oracle:thin:@[YOUR_HOST]:1521:[DATABASE_NAME]</tt>
+		<li>server: <tt>jdbc:oracle:thin:@[HOST]:[PORT]/[SERVICE]</tt>
 	</ul><p>
 
-	where [YOUR_HOST] and [DATABASE_NAME] are the actual values for you server.
-	In many cases <code>localhost</code> is a suitable value for [YOUR_HOST] when
+	where [HOST], [PORT] and [SERVICE] are the actual values for you server.
+	In many cases <code>localhost</code> and <code>1521</code>
+	are suitable values for [HOST] and [PORT] when
 	your database is running on the same server as your webserver.
+	Ask your DBA for the service name.
 
 	<p><b>Setup Instructions</b><p>
 

documentation/docs/ldap-guide.html

@@ -427,9 +427,9 @@ <h3>Manually Editing the Config File</h3>
 <pre>
     &lt;ldap&gt;
       &lt;vcard-mapping&gt;
-
         &lt;![CDATA[
           &lt;vCard xmlns='vcard-temp'&gt;
+
             &lt;FN&gt;{displayName}&lt;/FN&gt;
             &lt;NICKNAME&gt;{uid}&lt;/NICKNAME&gt;
             &lt;BDAY&gt;{dob}&lt;/BDAY&gt;
@@ -439,7 +439,6 @@ <h3>Manually Editing the Config File</h3>
               &lt;EXTADR&gt;Ste 500&lt;/EXTADR&gt;
               &lt;STREET&gt;317 SW Alder St&lt;/STREET&gt;
               &lt;LOCALITY&gt;Portland&lt;/LOCALITY&gt;
-
               &lt;REGION&gt;Oregon&lt;/REGION&gt;
               &lt;PCODE&gt;97204&lt;/PCODE&gt;
               &lt;CTRY&gt;USA&lt;/CTRY&gt;
@@ -452,21 +451,22 @@ <h3>Manually Editing the Config File</h3>
             &lt;/TEL&gt;
 
             &lt;EMAIL&gt;
-            &lt;INTERNET/&gt;
-            &lt;USERID&gt;{mail}&lt;/USERID&gt;
+              &lt;HOME/&gt;
+              &lt;INTERNET/&gt;
+              &lt;PREF/&gt;
+              &lt;USERID&gt;{mail}&lt;/USERID&gt;
             &lt;/EMAIL&gt;
-            &lt;TITLE&gt;{title}&lt;/TITLE&gt;
 
+            &lt;TITLE&gt;{title}&lt;/TITLE&gt;
             &lt;ROLE&gt;&lt;/ROLE&gt;
+
             &lt;ORG&gt;
               &lt;ORGNAME&gt;{o}&lt;/ORGNAME&gt;
               &lt;ORGUNIT&gt;&lt;/ORGUNIT&gt;
-
             &lt;/ORG&gt;
+
             &lt;URL&gt;{labeledURI}&lt;/URL&gt;
-            &lt;DESC&gt;
-            uid: {uidNumber} home: {homeDirectory} shell: {loginShell}
-            &lt;/DESC&gt;
+            &lt;DESC&gt;uid: {uidNumber} home: {homeDirectory} shell: {loginShell}&lt;/DESC&gt;
 
           &lt;/vCard&gt;
         ]]&gt;

documentation/docs/protocol-support.html

@@ -130,11 +130,11 @@ <h2>Intermediate IM Protocol Suite Support</h2>
 <br>
 
 <a name="jeps"></a>
-<h2>List of JEPs Supported</h2>
+<h2>List of XEPs Supported</h2>
 
-<p>The table below lists all JEPs supported by Openfire and indicates which JEPs are part of the
+<p>The table below lists all XEPs supported by Openfire and indicates which XEPs are part of the
 <a href="#basic">Basic</a> or <a href="#intermediate">Intermediate</a> Protocol Suites listed above.
-JEPs that only require client-side support are omitted.</p>
+XEPs that only require client-side support are omitted.</p>
 
 <table class="dbtable">
 <tr>
@@ -159,10 +159,10 @@ <h2>List of JEPs Supported</h2>
   <td><a href="http://www.xmpp.org/extensions/xep-0045.html">XEP-0045</a>: Multi-User Chat</td>
   <td>Intermediate</td>
 </tr><tr>
-  <td><a href="http://www.xmpp.org/xeps/xep-0049.html">XEP-0049</a>: Private XML Storage</td>
+  <td><a href="http://www.xmpp.org/extensions/xep-0049.html">XEP-0049</a>: Private XML Storage</td>
   <td>-</td>
 </tr><tr>
-  <td><a href="http://www.xmpp.org/jeps/xep-0050.html">XEP-0050</a>: Ad-Hoc Commands</td>
+  <td><a href="http://www.xmpp.org/extensions/xep-0050.html">XEP-0050</a>: Ad-Hoc Commands</td>
   <td>-</td>
 </tr><tr>
   <td><a href="http://www.xmpp.org/extensions/xep-0054.html">XEP-0054</a>: vcard-temp</td>
@@ -177,7 +177,7 @@ <h2>List of JEPs Supported</h2>
   <td><a href="http://www.xmpp.org/extensions/xep-0060.html">XEP-0060</a>: Publish-Subscribe</td>
   <td>-</td>
 </tr><tr>
-  <td><a href="http://www.jabber.org/jeps/xep-0065.html">XEP-0065</a>: SOCKS5 Bytestreams</td>
+  <td><a href="http://www.xmpp.org/extensions/xep-0065.html">XEP-0065</a>: SOCKS5 Bytestreams</td>
   <td>Intermediate</td>
 </tr><tr>
   <td><a href="http://www.xmpp.org/extensions/xep-0077.html">XEP-0077</a>: In-Band Registration</td>
@@ -195,7 +195,7 @@ <h2>List of JEPs Supported</h2>
   <td><a href="http://www.xmpp.org/extensions/xep-0090.html">XEP-0090</a>: Entity Time</td>
   <td>-</td>
 </tr><tr>
-  <td><a href="http://www.xmpp.org/extensions/xep-0091.html">XEP-0091</a>: Delayed Delivery</td>
+  <td><a href="http://www.xmpp.org/extensions/xep-0091.html">XEP-0091</a>: Legacy Delayed Delivery</td>
   <td>-</td>
 </tr><tr>
   <td><a href="http://www.xmpp.org/extensions/xep-0092.html">XEP-0092</a>: Software Version</td>
@@ -215,6 +215,9 @@ <h2>List of JEPs Supported</h2>
 </tr><tr>
   <td><a href="http://www.xmpp.org/extensions/xep-0124.html">XEP-0124</a>: HTTP Binding</td>
   <td>-</td>
+</tr><tr>
+  <td><a href="http://www.xmpp.org/extensions/xep-0126.html">XEP-0126</a>: Invisibility</td>
+  <td>-</td>
 </tr><tr>
   <td><a href="http://www.xmpp.org/extensions/xep-0128.html">XEP-0128</a>: Service Discovery Extensions</td>
   <td>-</td>
@@ -227,6 +230,9 @@ <h2>List of JEPs Supported</h2>
 </tr><tr>
   <td><a href="http://www.xmpp.org/extensions/xep-0175.html">XEP-0175</a>: Best Practices for Use of SASL ANONYMOUS</td>
   <td>-</td>
+</tr><tr>
+  <td><a href="http://www.xmpp.org/extensions/xep-0203.html">XEP-0203</a>: Delayed Delivery</td>
+  <td>-</td>
 </tr>
 </table>
 <br>