Thank you for downloading the Wildfire connection manager module!
-Connection managers improve the scalability of the Wildfire by allowing multiple servers +Connection managers improve the scalability of the Wildfire server by allowing multiple servers to handle the load of client connections. Each connection manager aggregates XMPP client connections and forwards their traffic to a central XMPP server. For more information and installation instructions, view the diff --git a/documentation/docs/install-guide.html b/documentation/docs/install-guide.html index 1653d20..c9042ad 100644 --- a/documentation/docs/install-guide.html +++ b/documentation/docs/install-guide.html @@ -18,14 +18,14 @@
tar -xzvf cmanager_3_0_0.tar.gz
- mv cmanager /opt
tar -xzvf connection_manager_3_0_0.tar.gz
+ mv connection_manager /opt
Note: the .tar.gz and .zip builds do 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" @@ -50,7 +50,7 @@
The files in your distribution should be as follows (some sub-directories omitted for brevity):
-cmanager/
+connection_manager/
|- readme.html
|- license.html
|- conf/
diff --git a/src/bin/cmanager.sh b/src/bin/cmanager.sh
index b8f5572..9cca5b0 100644
--- a/src/bin/cmanager.sh
+++ b/src/bin/cmanager.sh
@@ -27,19 +27,19 @@
#if cmanager home is not set or is not a directory
if [ -z "$CMANAGER_HOME" -o ! -d "$CMANAGER_HOME" ]; then
- if [ -d /opt/cmanager ] ; then
- CMANAGER_HOME="/opt/cmanager"
+ if [ -d /opt/connection_manager ] ; then
+ CMANAGER_HOME="/opt/connection_manager"
fi
- if [ -d /usr/local/cmanager ] ; then
- CMANAGER_HOME="/usr/local/cmanager"
+ if [ -d /usr/local/connection_manager ] ; then
+ CMANAGER_HOME="/usr/local/connection_manager"
fi
- if [ -d ${HOME}/opt/cmanager ] ; then
- CMANAGER_HOME="${HOME}/opt/cmanager"
+ if [ -d ${HOME}/opt/connection_manager ] ; then
+ CMANAGER_HOME="${HOME}/opt/connection_manager"
fi
- #resolve links - $0 may be a link in cmanager's home
+ #resolve links - $0 may be a link in connection_manager's home
PRG="0"
progname=`basename "$0$"`
diff --git a/src/bin/extra/cmanagerd b/src/bin/extra/cmanagerd
index 674205a..6f4b8a1 100644
--- a/src/bin/extra/cmanagerd
+++ b/src/bin/extra/cmanagerd
@@ -24,7 +24,7 @@
#
# Set this to tell this script where Connection Manager lives
-# If this is not set the script will look for /opt/cmanager, then /usr/local/cmanager
+# If this is not set the script will look for /opt/connection_manager, then /usr/local/connection_manager
#export CMANAGER_HOME=
# If there is a different user you would like to run this script as,
@@ -35,10 +35,10 @@
# If a Connection Manager home variable has not been specified, try to determine it
if [ ! $CMANAGER_HOME ]; then
- if [ -d "/opt/cmanager" ]; then
- CMANAGER_HOME="/opt/cmanager"
- elif [ -d "/usr/local/cmanager" ]; then
- CMANAGER_HOME="/usr/local/cmanager"
+ if [ -d "/opt/connection_manager" ]; then
+ CMANAGER_HOME="/opt/connection_manager"
+ elif [ -d "/usr/local/connection_manager" ]; then
+ CMANAGER_HOME="/usr/local/connection_manager"
else
echo "Could not find Connection Manager installation under /opt or /usr/local"
echo "Please specify the Connection Manager installation location in environment variable CMANAGER_HOME"
diff --git a/src/bin/extra/redhat-postinstall.sh b/src/bin/extra/redhat-postinstall.sh
index 1fecbcf..4ebfa4b 100644
--- a/src/bin/extra/redhat-postinstall.sh
+++ b/src/bin/extra/redhat-postinstall.sh
@@ -16,10 +16,10 @@
CMANAGER_GROUP="jive"
if [ ! $CMANAGER_HOME ]; then
- if [ -d "/opt/cmanager" ]; then
- CMANAGER_HOME="/opt/cmanager"
- elif [ -d "/usr/local/cmanager" ]; then
- CMANAGER_HOME="/usr/local/cmanager"
+ if [ -d "/opt/connection_manager" ]; then
+ CMANAGER_HOME="/opt/connection_manager"
+ elif [ -d "/usr/local/connection_manager" ]; then
+ CMANAGER_HOME="/usr/local/connection_manager"
fi
fi
diff --git a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
index 022ba8b..bd068dc 100644
--- a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
+++ b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
@@ -13,21 +13,21 @@
import org.dom4j.Document;
import org.dom4j.io.SAXReader;
-import org.jivesoftware.util.*;
-import org.jivesoftware.multiplexer.net.SocketAcceptThread;
import org.jivesoftware.multiplexer.net.SSLSocketAcceptThread;
+import org.jivesoftware.multiplexer.net.SocketAcceptThread;
import org.jivesoftware.multiplexer.net.SocketSendingTracker;
+import org.jivesoftware.util.*;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
/**
* Connection managers handle connections of clients that want to connect to a server. Each
@@ -129,7 +129,7 @@
name = JiveGlobals.getXMLProperty("xmpp.manager.name", StringUtils.randomString(5)).toLowerCase();
serverName = JiveGlobals.getXMLProperty("xmpp.domain");
- version = new Version(3, 0, 0, Version.ReleaseStatus.Beta, -1);
+ version = new Version(3, 0, 0, Version.ReleaseStatus.Release, -1);
if (serverName != null) {
setupMode = false;
}