You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/04/20 10:15:04 UTC
svn commit: r530686 -
/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java
Author: ritchiem
Date: Fri Apr 20 01:14:57 2007
New Revision: 530686
URL: http://svn.apache.org/viewvc?view=rev&rev=530686
Log:
Moved string literal 'Qpid_HOME' to constant QPID_HOME
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java
Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java?view=diff&rev=530686&r1=530685&r2=530686
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java Fri Apr 20 01:14:57 2007
@@ -70,6 +70,7 @@
private static final String DEFAULT_CONFIG_FILE = "etc/config.xml";
private static final String DEFAULT_LOG_CONFIG_FILENAME = "log4j.xml";
+ public static final String QPID_HOME = "QPID_HOME";
protected static class InitException extends Exception
{
@@ -200,7 +201,7 @@
protected void startup() throws InitException, ConfigurationException, Exception
{
- final String QpidHome = System.getProperty("QPID_HOME");
+ final String QpidHome = System.getProperty(QPID_HOME);
final File defaultConfigFile = new File(QpidHome, DEFAULT_CONFIG_FILE);
final File configFile = new File(commandLine.getOptionValue("c", defaultConfigFile.getPath()));
if (!configFile.exists())
@@ -209,7 +210,7 @@
if (QpidHome == null)
{
- error = error + "\nNote: Qpid_HOME is not set.";
+ error = error + "\nNote: "+QPID_HOME+" is not set.";
}
throw new InitException(error, null);