Commit 4b38f329 authored by Matt Tucker's avatar Matt Tucker Committed by matt

Default to jive-messenger.xml if another name is not specified.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1394 b35dd754-fafc-0310-a699-88a17e54d16e
parent e55d26d2
...@@ -637,7 +637,7 @@ public class JiveGlobals { ...@@ -637,7 +637,7 @@ public class JiveGlobals {
/** /**
* Allows the name of the local config file name to be changed. The * Allows the name of the local config file name to be changed. The
* default is "jive_startup.xml". * default is "jive-messenger.xml".
* *
* @param configName the name of the config file. * @param configName the name of the config file.
*/ */
...@@ -650,13 +650,12 @@ public class JiveGlobals { ...@@ -650,13 +650,12 @@ public class JiveGlobals {
* *
* @return the name of the config file. * @return the name of the config file.
*/ */
static String getConfigName() { static String getConfigName() {
if (JIVE_CONFIG_FILENAME == null) { if (JIVE_CONFIG_FILENAME == null) {
throw new IllegalStateException("Need to set the configuration filename to use " + JIVE_CONFIG_FILENAME = "jive-messenger.xml";
"before sending this message"); };
};
return JIVE_CONFIG_FILENAME; return JIVE_CONFIG_FILENAME;
} }
/** /**
* Returns true if in setup mode. * Returns true if in setup mode.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment