Author: kwall
Date: Tue Jun 9 21:13:19 2015
New Revision: 1684534
URL: http://svn.apache.org/r1684534
Log:
QPID-6533: [Java Broker] Remove remaining log4j configuration options and
remaining log4j test support
Added:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Slf4jLoggingHandler.java
- copied, changed from r1684380,
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java
Removed:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
qpid/java/trunk/bdbstore/systests/pom.xml
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java
qpid/java/trunk/pom.xml
qpid/java/trunk/qpid-systests-parent/pom.xml
qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java
qpid/java/trunk/test-profiles/JavaExcludes
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
Tue Jun 9 21:13:19 2015
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.util.FutureResult;
-import org.apache.qpid.server.store.berkeleydb.logging.Log4jLoggingHandler;
+import org.apache.qpid.server.store.berkeleydb.logging.Slf4jLoggingHandler;
public class StandardEnvironmentFacade implements EnvironmentFacade
{
@@ -80,7 +80,7 @@ public class StandardEnvironmentFacade i
envConfig.setConfigParam(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF");
envConfig.setConfigParam(EnvironmentConfig.CONSOLE_LOGGING_LEVEL,
"OFF");
- envConfig.setLoggingHandler(new
Log4jLoggingHandler("["+configuration.getName()+"]"));
+ envConfig.setLoggingHandler(new
Slf4jLoggingHandler("["+configuration.getName()+"]"));
Map<String, String> params = new
HashMap<>(EnvironmentFacade.ENVCONFIG_DEFAULTS);
params.putAll(configuration.getParameters());
Copied:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Slf4jLoggingHandler.java
(from r1684380,
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Slf4jLoggingHandler.java?p2=qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Slf4jLoggingHandler.java&p1=qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java&r1=1684380&r2=1684534&rev=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Slf4jLoggingHandler.java
Tue Jun 9 21:13:19 2015
@@ -33,9 +33,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Log4jLoggingHandler extends Handler
+public class Slf4jLoggingHandler extends Handler
{
- public Log4jLoggingHandler(final String prefix)
+ public Slf4jLoggingHandler(final String prefix)
{
setFormatter(new Formatter()
{
@@ -47,9 +47,9 @@ public class Log4jLoggingHandler extends
});
}
- private static interface MappedLevel
+ private interface MappedLevel
{
- public boolean isEnabled(final Logger logger);
+ boolean isEnabled(final Logger logger);
void log(Logger logger, String message);
}
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Tue Jun 9 21:13:19 2015
@@ -79,7 +79,7 @@ import org.apache.qpid.server.store.berk
import org.apache.qpid.server.store.berkeleydb.CoalescingCommiter;
import org.apache.qpid.server.store.berkeleydb.EnvHomeRegistry;
import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade;
-import org.apache.qpid.server.store.berkeleydb.logging.Log4jLoggingHandler;
+import org.apache.qpid.server.store.berkeleydb.logging.Slf4jLoggingHandler;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.DaemonThreadFactory;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -1144,7 +1144,7 @@ public class ReplicatedEnvironmentFacade
envConfig.setConfigParam(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF");
envConfig.setConfigParam(EnvironmentConfig.CONSOLE_LOGGING_LEVEL,
"OFF");
- envConfig.setLoggingHandler(new Log4jLoggingHandler("[" +
_configuration.getName() + "]"));
+ envConfig.setLoggingHandler(new Slf4jLoggingHandler("[" +
_configuration.getName() + "]"));
for (Map.Entry<String, String> configItem :
environmentParameters.entrySet())
{
Modified: qpid/java/trunk/bdbstore/systests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/pom.xml?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/systests/pom.xml (original)
+++ qpid/java/trunk/bdbstore/systests/pom.xml Tue Jun 9 21:13:19 2015
@@ -30,7 +30,6 @@
<description>BDB message store system tests</description>
<properties>
-
<test.log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}..${file.separator}test-profiles${file.separator}logback-test.xml</test.log4j.configuration.file>
<test.working.directory>${basedir}/../..</test.working.directory>
<test.resource.directory>${basedir}/../..</test.resource.directory>
<test.systest.resource.directory>${basedir}/../../systests</test.systest.resource.directory>
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
Tue Jun 9 21:13:19 2015
@@ -66,7 +66,6 @@ public class BDBHAVirtualHostNodeRestTes
public void setUp() throws Exception
{
setTestSystemProperty(ReplicatedEnvironmentFacade.REMOTE_NODE_MONITOR_INTERVAL_PROPERTY_NAME,
"1000");
- setTestClientSystemProperty("log4j.configuration",
getBrokerCommandLog4JFile().toURI().toString());
super.setUp();
_hostName = getTestName();
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java
Tue Jun 9 21:13:19 2015
@@ -57,7 +57,6 @@ public class BDBHAVirtualHostRestTest ex
public void setUp() throws Exception
{
setTestSystemProperty(ReplicatedEnvironmentFacade.REMOTE_NODE_MONITOR_INTERVAL_PROPERTY_NAME,
"1000");
- setTestClientSystemProperty("log4j.configuration",
getBrokerCommandLog4JFile().toURI().toString());
_hostName = "ha";
_nodeName = "node1";
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
Tue Jun 9 21:13:19 2015
@@ -211,7 +211,7 @@ public class GroupCreator
{
try
{
- _testcase.startBroker(brokerPortNumber,
brokerConfig, null);
+ _testcase.startBroker(brokerPortNumber,
brokerConfig);
return "OK";
}
catch (Exception e)
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
Tue Jun 9 21:13:19 2015
@@ -78,8 +78,6 @@ public class JMXManagementTest extends Q
{
_brokerType = BrokerHolder.BrokerType.SPAWNED;
- setTestClientSystemProperty("log4j.configuration",
getBrokerCommandLog4JFile().toURI().toString());
-
_clusterCreator.configureClusterNodes();
_brokerFailoverUrl =
_clusterCreator.getConnectionUrlForAllClusterNodes();
_clusterCreator.startCluster();
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
Tue Jun 9 21:13:19 2015
@@ -83,9 +83,6 @@ public class MultiNodeTest extends QpidB
assertTrue(isJavaBroker());
assertTrue(isBrokerStorePersistent());
- setSystemProperty("java.util.logging.config.file", "etc" +
File.separator + "log.properties");
- setTestClientSystemProperty("log4j.configuration",
getBrokerCommandLog4JFile().toURI().toString());
-
_groupCreator.configureClusterNodes();
_positiveFailoverUrl =
_groupCreator.getConnectionUrlForAllClusterNodes();
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java
Tue Jun 9 21:13:19 2015
@@ -50,8 +50,6 @@ public class TwoNodeTest extends QpidBro
{
_brokerType = BrokerHolder.BrokerType.SPAWNED;
- setTestClientSystemProperty("log4j.configuration",
getBrokerCommandLog4JFile().toURI().toString());
-
assertTrue(isJavaBroker());
assertTrue(isBrokerStorePersistent());
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
Tue Jun 9 21:13:19 2015
@@ -52,7 +52,6 @@ public class BrokerOptions
public static final String DEFAULT_INITIAL_CONFIG_NAME =
"initial-config.json";
public static final String DEFAULT_STORE_TYPE = "JSON";
public static final String DEFAULT_CONFIG_NAME_PREFIX = "config";
- public static final String DEFAULT_LOG_CONFIG_FILE = "etc/logback.xml";
public static final String DEFAULT_INITIAL_CONFIG_LOCATION =
BrokerOptions.class.getClassLoader().getResource(DEFAULT_INITIAL_CONFIG_NAME).toExternalForm();
@@ -60,8 +59,6 @@ public class BrokerOptions
private static final File FALLBACK_WORK_DIR = new
File(System.getProperty("user.dir"), "work");
- private String _logConfigFile;
-
private String _configurationStoreLocation;
private String _configurationStoreType;
@@ -309,32 +306,6 @@ public class BrokerOptions
return Collections.unmodifiableMap(properties);
}
- /**
- * Get the broker logging configuration file location.
- *
- * If not previously explicitly set, defaults to {@value
#DEFAULT_LOG_CONFIG_FILE} within the broker
- * home directory if configured (gathered via config property {@link
#QPID_HOME_DIR}) or the current
- * JVM working directory if not.
- *
- * @return the previously set logging configuration file location, or the
default location if none was set.
- */
- public String getLogConfigFileLocation()
- {
- if(_logConfigFile == null)
- {
- String homeDir = getHomeDir();
-
- return new File(homeDir,
DEFAULT_LOG_CONFIG_FILE).getAbsolutePath();
- }
-
- return _logConfigFile;
- }
-
- public void setLogConfigFileLocation(final String logConfigFile)
- {
- _logConfigFile = logConfigFile;
- }
-
private String getWorkDir()
{
if(!_configProperties.containsKey(QPID_WORK_DIR))
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
Tue Jun 9 21:13:19 2015
@@ -31,8 +31,6 @@ READY = BRK-1004 : Qpid Broker Ready
STOPPED = BRK-1005 : Stopped
# 0 - path
CONFIG = BRK-1006 : Using configuration : {0}
-# 0 - path
-LOG_CONFIG = BRK-1007 : Using logging configuration : {0}
STATS_DATA = BRK-1008 : {0,choice,0#delivered|1#received} : {1,number,#.###}
kB/s peak : {2,number,#} bytes total
STATS_MSGS = BRK-1009 : {0,choice,0#delivered|1#received} : {1,number,#.###}
msg/s peak : {2,number,#} msgs total
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
Tue Jun 9 21:13:19 2015
@@ -84,32 +84,6 @@ public class BrokerOptionsTest extends Q
assertEquals(testConfigFile, _options.getConfigurationStoreLocation());
}
- public void testDefaultLogConfigFileWithQpidHome()
- {
- String qpidHome = "/test/value";
- setTestSystemProperty(BrokerProperties.PROPERTY_QPID_HOME, qpidHome);
-
- String expectedPath = new File(qpidHome,
BrokerOptions.DEFAULT_LOG_CONFIG_FILE).getAbsolutePath();
-
- assertEquals(expectedPath, _options.getLogConfigFileLocation());
- }
-
- public void testDefaultLogConfigFileWithoutQpidHome()
- {
- setTestSystemProperty(BrokerProperties.PROPERTY_QPID_HOME, null);
-
- String expectedPath = new
File(BrokerOptions.DEFAULT_LOG_CONFIG_FILE).getAbsolutePath();
-
- assertEquals(expectedPath, _options.getLogConfigFileLocation());
- }
-
- public void testOverriddenLogConfigFile()
- {
- final String testLogConfigFile = "etc/mytestlog4j.xml";
- _options.setLogConfigFileLocation(testLogConfigFile);
- assertEquals(testLogConfigFile, _options.getLogConfigFileLocation());
- }
-
public void testDefaultInitialConfigurationLocation()
{
assertEquals(BrokerOptions.DEFAULT_INITIAL_CONFIG_LOCATION,
_options.getInitialConfigurationLocation());
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
Tue Jun 9 21:13:19 2015
@@ -102,18 +102,6 @@ public class BrokerMessagesTest extends
validateLogMessage(log, "BRK-1006", expected);
}
- public void testBrokerLogConfig()
- {
- String path = "/file/path/to/configuration.xml";
-
- _logMessage = BrokerMessages.LOG_CONFIG(path);
- List<Object> log = performLog();
-
- String[] expected = {"Using logging configuration :", path};
-
- validateLogMessage(log, "BRK-1007", expected);
- }
-
public void testBrokerPlatform()
{
String javaVendor = "jvendor";
Modified: qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
--- qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
(original)
+++ qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java Tue
Jun 9 21:13:19 2015
@@ -75,12 +75,6 @@ public class Main
.withDescription("set a configuration property to use when
resolving variables in the broker configuration store, with format
\"name=value\"")
.withLongOpt("config-property").create("prop");
- private static final Option OPTION_LOG_CONFIG_FILE =
- OptionBuilder.withArgName("file").hasArg()
- .withDescription("use the specified log4j xml
configuration file. By "
- + "default looks for a file named " +
BrokerOptions.DEFAULT_LOG_CONFIG_FILE
- + " in the same directory as the
configuration file").withLongOpt("logconfig").create("l");
-
private static final Option OPTION_MANAGEMENT_MODE =
OptionBuilder.withDescription("start broker in management mode, disabling the
AMQP ports")
.withLongOpt("management-mode").create("mm");
private static final Option OPTION_MM_QUIESCE_VHOST =
OptionBuilder.withDescription("make virtualhosts stay in the quiesced state
during management mode.")
@@ -107,7 +101,6 @@ public class Main
OPTIONS.addOption(OPTION_CONFIGURATION_STORE_TYPE);
OPTIONS.addOption(OPTION_OVERWRITE_CONFIGURATION_STORE);
OPTIONS.addOption(OPTION_CREATE_INITIAL_CONFIG);
- OPTIONS.addOption(OPTION_LOG_CONFIG_FILE);
OPTIONS.addOption(OPTION_INITIAL_CONFIGURATION_PATH);
OPTIONS.addOption(OPTION_MANAGEMENT_MODE);
OPTIONS.addOption(OPTION_MM_QUIESCE_VHOST);
@@ -256,12 +249,6 @@ public class Main
options.setConfigurationStoreType(configurationStoreType);
}
- String logConfig =
_commandLine.getOptionValue(OPTION_LOG_CONFIG_FILE.getOpt());
- if(logConfig != null)
- {
- options.setLogConfigFileLocation(logConfig);
- }
-
boolean overwriteConfigurationStore =
_commandLine.hasOption(OPTION_OVERWRITE_CONFIGURATION_STORE.getOpt());
options.setOverwriteConfigurationStore(overwriteConfigurationStore);
Modified:
qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
--- qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java
(original)
+++ qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java
Tue Jun 9 21:13:19 2015
@@ -44,13 +44,11 @@ public class MainTest extends QpidTestCa
setTestSystemProperty(BrokerProperties.PROPERTY_QPID_HOME, qpidHome);
String expectedStorePath = new File(qpidWork,
BrokerOptions.DEFAULT_CONFIG_NAME_PREFIX + ".json").getAbsolutePath();
- String expectedLogConfigPath = new File(qpidHome,
BrokerOptions.DEFAULT_LOG_CONFIG_FILE).getAbsolutePath();
BrokerOptions options = startDummyMain("");
assertEquals("JSON", options.getConfigurationStoreType());
assertEquals(expectedStorePath,
options.getConfigurationStoreLocation());
- assertEquals(expectedLogConfigPath,
options.getLogConfigFileLocation());
assertEquals(BrokerOptions.DEFAULT_INITIAL_CONFIG_LOCATION,
options.getInitialConfigurationLocation());
assertFalse(options.isOverwriteConfigurationStore());
assertFalse(options.isManagementMode());
@@ -86,13 +84,6 @@ public class MainTest extends QpidTestCa
assertTrue(options.isOverwriteConfigurationStore());
}
- public void testLogConfig()
- {
- BrokerOptions options = startDummyMain("-l wxyz/log4j.xml");
-
- assertEquals("wxyz/log4j.xml", options.getLogConfigFileLocation());
- }
-
public void testVersion()
{
final TestMain main = new TestMain("-v".split("\\s"));
Modified: qpid/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Tue Jun 9 21:13:19 2015
@@ -62,8 +62,8 @@
<profile.broker.type>internal</profile.broker.type>
<profile.broker.stopped>Exception</profile.broker.stopped>
<profile.broker.ready>BRK-1004</profile.broker.ready>
-
<profile.broker.command>"${qpid.home}${file.separator}bin${file.separator}qpid-server"
-sp ${at.sign}STORE_PATH -st ${at.sign}STORE_TYPE -l
${at.sign}LOG_CONFIG_FILE</profile.broker.command>
-
<profile.broker.command.windows>"${qpid.home}${file.separator}bin${file.separator}qpid-server.bat"
-sp ${at.sign}STORE_PATH -st ${at.sign}STORE_TYPE -l
${at.sign}LOG_CONFIG_FILE</profile.broker.command.windows>
+
<profile.broker.command>"${qpid.home}${file.separator}bin${file.separator}qpid-server"
-sp ${at.sign}STORE_PATH -st ${at.sign}STORE_TYPE</profile.broker.command>
+
<profile.broker.command.windows>"${qpid.home}${file.separator}bin${file.separator}qpid-server.bat"
-sp ${at.sign}STORE_PATH -st
${at.sign}STORE_TYPE</profile.broker.command.windows>
<profile.test.excludes>Excludes JavaExcludes ${profile}.excludes
${profile.specific.excludes}</profile.test.excludes>
<profile.specific.excludes>JavaTransientExcludes
Java010Excludes</profile.specific.excludes>
<profile.broker.version>v0_10</profile.broker.version>
Modified: qpid/java/trunk/qpid-systests-parent/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/qpid-systests-parent/pom.xml?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
--- qpid/java/trunk/qpid-systests-parent/pom.xml (original)
+++ qpid/java/trunk/qpid-systests-parent/pom.xml Tue Jun 9 21:13:19 2015
@@ -86,13 +86,6 @@
<systemPropertyVariables>
<java.naming.provider.url>test-profiles${file.separator}test-provider.properties</java.naming.provider.url>
<test.output.dir>${test.output.dir}</test.output.dir>
-
<log4j.configuration.file>${basedir}${file.separator}target${file.separator}classes/logback.xml</log4j.configuration.file>
- <!-- Let the tests themselves configure logging so that we can
have a separate log file per test
- named after the test. -->
- <log4j.debug>false</log4j.debug>
- <log4j.defaultInitOverride>true</log4j.defaultInitOverride>
- <!-- A log4j config file that sends all the Broker's output to
stdout -->
-
<spawnedbroker.log4j.configuration.file>${basedir}${file.separator}target${file.separator}classes/spawned-broker-logback.xml</spawnedbroker.log4j.configuration.file>
</systemPropertyVariables>
</configuration>
<executions>
Modified:
qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Tue Jun 9 21:13:19 2015
@@ -46,7 +46,6 @@ public class QpidTestCase extends TestCa
public static final String TEST_RESOURCES_DIR = QPID_HOME +
"/../test-profiles/test_resources/";
public static final String TEST_PROFILES_DIR = QPID_HOME +
"/../test-profiles/";
public static final String TMP_FOLDER =
System.getProperty("java.io.tmpdir");
- public static final String SPAWNED_BROKER_LOG4J_CONFIG_FILE_PATH =
System.getProperty("spawnedbroker.log4j.configuration.file");
private static final Logger _logger =
LoggerFactory.getLogger(QpidTestCase.class);
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/BrokerCommandHelper.java
Tue Jun 9 21:13:19 2015
@@ -17,7 +17,6 @@
*/
package org.apache.qpid.test.utils;
-import java.io.File;
import java.util.LinkedList;
import java.util.List;
@@ -37,7 +36,7 @@ public class BrokerCommandHelper
_brokerCommandTemplateAsList = split(brokerCommandTemplate);
}
- public String[] getBrokerCommand( int port, String storePath, String
storeType, File logConfigFile)
+ public String[] getBrokerCommand(int port, String storePath, String
storeType)
{
String[] command = new String[_brokerCommandTemplateAsList.size()];
int i=0;
@@ -46,36 +45,12 @@ public class BrokerCommandHelper
command[i] = commandPart
.replace("@PORT", "" + port)
.replace("@STORE_PATH", storePath)
- .replace("@STORE_TYPE", storeType)
- .replace("@LOG_CONFIG_FILE", '"' +
logConfigFile.getAbsolutePath() + '"');
+ .replace("@STORE_TYPE", storeType);
i++;
}
return command;
}
- private int getBrokerCommandLogOptionIndex(String logOption)
- {
- int logOptionIndex = _brokerCommandTemplateAsList.indexOf(logOption);
- if(logOptionIndex == -1)
- {
- throw new RuntimeException("Could not find option " + logOption +
" in " + _brokerCommandTemplateAsList);
- }
- return logOptionIndex;
- }
-
-
- public void removeBrokerCommandLog4JFile()
- {
- String logOption = "-l";
- int logOptionIndex = getBrokerCommandLogOptionIndex(logOption);
- if (logOptionIndex + 1 >= _brokerCommandTemplateAsList.size())
- {
- throw new RuntimeException("Could not find log config location");
- }
- _brokerCommandTemplateAsList.remove(logOptionIndex);
- _brokerCommandTemplateAsList.remove(logOptionIndex);
- }
-
private static List<String> split(String str)
{
List<String> tokens = new LinkedList<String>();
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Tue Jun 9 21:13:19 2015
@@ -81,7 +81,6 @@ public class QpidBrokerTestCase extends
public static final String GUEST_PASSWORD = "guest";
private final File _configFile = new
File(System.getProperty("broker.config"));
- private File _spawnedBrokerLogConfigFile;
protected final String _brokerStoreType =
System.getProperty("broker.config-store-type", "JSON");
protected static final Logger _logger =
LoggerFactory.getLogger(QpidBrokerTestCase.class);
protected static final int LOGMONITOR_TIMEOUT = 5000;
@@ -200,8 +199,7 @@ public class QpidBrokerTestCase extends
public QpidBrokerTestCase()
{
super();
- _brokerConfigurations = new HashMap<Integer,
TestBrokerConfiguration>();
- initialiseSpawnedBrokerLogConfigFile();
+ _brokerConfigurations = new HashMap<>();
_brokerCommandTemplate = BROKER_COMMAND_TEMPLATE;
@@ -264,15 +262,6 @@ public class QpidBrokerTestCase extends
return configuration;
}
- private void initialiseSpawnedBrokerLogConfigFile()
- {
- _spawnedBrokerLogConfigFile = new
File(SPAWNED_BROKER_LOG4J_CONFIG_FILE_PATH);
- if(!_spawnedBrokerLogConfigFile.exists())
- {
- throw new RuntimeException("Log config file " +
_spawnedBrokerLogConfigFile.getAbsolutePath() + " does not exist");
- }
- }
-
public Logger getLogger()
{
return QpidBrokerTestCase._logger;
@@ -400,33 +389,19 @@ public class QpidBrokerTestCase extends
public void startBroker(int port, boolean managementMode) throws Exception
{
- startBroker(port, managementMode, null);
- }
-
- public void startBroker(int port, boolean managementMode, String
log4jFile) throws Exception
- {
int actualPort = getPort(port);
TestBrokerConfiguration configuration =
getBrokerConfiguration(actualPort);
- startBroker(actualPort, configuration, managementMode, log4jFile);
- }
-
- protected File getBrokerCommandLog4JFile()
- {
- return _spawnedBrokerLogConfigFile;
- }
-
- protected void setBrokerCommandLog4JFile(File file)
- {
- _spawnedBrokerLogConfigFile = file;
- _logger.info("Modified log config file to: " + file);
+ startBroker(actualPort, configuration, managementMode);
}
- public void startBroker(int port, TestBrokerConfiguration
testConfiguration, String log4jFile) throws Exception
+ public void startBroker(int port, TestBrokerConfiguration
testConfiguration) throws Exception
{
- startBroker(port, testConfiguration, false, log4jFile);
+ startBroker(port, testConfiguration, false);
}
- protected void startBroker(int port, TestBrokerConfiguration
testConfiguration, boolean managementMode, String log4jFile) throws Exception
+ protected void startBroker(int port,
+ TestBrokerConfiguration testConfiguration,
+ boolean managementMode) throws Exception
{
port = getPort(port);
@@ -436,8 +411,7 @@ public class QpidBrokerTestCase extends
}
String testConfig = saveTestConfiguration(port, testConfiguration);
- String log4jConfig = log4jFile == null ?
getBrokerCommandLog4JFile().getAbsolutePath() : log4jFile;
- BrokerOptions options = getBrokerOptions(managementMode, testConfig,
log4jConfig, log4jFile == null);
+ BrokerOptions options = getBrokerOptions(managementMode, testConfig);
BrokerHolder holder = new BrokerHolderFactory().create(_brokerType,
port, this);
_brokers.put(port, holder);
holder.start(options);
@@ -1247,7 +1221,7 @@ public class QpidBrokerTestCase extends
session.close();
}
- protected BrokerOptions getBrokerOptions( boolean managementMode, String
testConfig, String log4jConfig, boolean skipLoggingConfiguration)
+ protected BrokerOptions getBrokerOptions(boolean managementMode, String
testConfig)
{
BrokerOptions options = new BrokerOptions();
@@ -1258,8 +1232,6 @@ public class QpidBrokerTestCase extends
{
options.setManagementModePassword(MANAGEMENT_MODE_PASSWORD);
}
- options.setSkipLoggingConfiguration(skipLoggingConfiguration);
- options.setLogConfigFileLocation(log4jConfig);
options.setStartupLoggedToSystemOut(false);
options.setConfigProperty("test.name", getClass().getSimpleName() +
"-" + getName());
return options;
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
Tue Jun 9 21:13:19 2015
@@ -79,8 +79,7 @@ public class SpawnedBrokerHolder impleme
// Add the port to QPID_WORK to ensure unique working dirs for multi
broker tests
final String qpidWork = getQpidWork(_type, _port);
- String[] cmd = _brokerCommandHelper.getBrokerCommand(_port,
brokerOptions.getConfigurationStoreLocation(),
brokerOptions.getConfigurationStoreType(),
- new File(brokerOptions.getLogConfigFileLocation()));
+ String[] cmd = _brokerCommandHelper.getBrokerCommand(_port,
brokerOptions.getConfigurationStoreLocation(),
brokerOptions.getConfigurationStoreType());
if (brokerOptions.isManagementMode())
{
String[] newCmd = new String[cmd.length + 3];
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
Tue Jun 9 21:13:19 2015
@@ -75,7 +75,7 @@ public class BrokerStartupTest extends A
FileUtils.delete(brokerConfigFile, true);
}
- startBroker(port, null, null);
+ startBroker(port, null);
AMQConnectionURL url = new AMQConnectionURL(String.format("amqp://"
+
GUEST_USERNAME
@@ -87,102 +87,6 @@ public class BrokerStartupTest extends A
conn.close();
}
}
- /**
- * Description:
- * Test that providing an invalid broker logging configuration file does
not
- * cause the broker to enable DEBUG logging that will seriously impair
- * performance
- * Input:
- * -l value that does not exist
- * <p/>
- * Output:
- * <p/>
- * No DEBUG output
- * <p/>
- * Validation Steps:
- * <p/>
- * 1. Start the broker and verify no DEBUG output exists
- *
- * @throws Exception caused by broker startup
- */
- public void testInvalidLog4jConfigurationFile() throws Exception
- {
- // This logging startup code only occurs when you run a Java broker,
- // that broker must be started via Main so not an InVM broker.
- if (isJavaBroker() && isExternalBroker() && !isInternalBroker())
- {
- //Remove test Log4j config from the commandline
- setBrokerCommandLog4JFile(new File("invalid file"));
-
- // The broker has a built in default log4j configuration set up
- // so if the the broker cannot load the -l value it will use
default
- // use this default. Test that this is correctly loaded, by
- // including -Dlog4j.debug so we can validate.
- setBrokerEnvironment("QPID_OPTS", "-Dlog4j.debug");
-
-/*
- // Disable all client logging so we can test for broker DEBUG only.
- setLoggerLevel(Logger.getRootLogger(), Level.WARN);
- setLoggerLevel(Logger.getLogger("qpid.protocol"), Level.WARN);
- setLoggerLevel(Logger.getLogger("org.apache.qpid"), Level.WARN);
-*/
-
- // Set the broker to use info level logging, which is the
qpid-server
- // default. Rather than debug which is the test default.
- setBrokerOnlySystemProperty("amqj.server.logging.level", "info");
- // Set the logging defaults to info for this test.
- setBrokerOnlySystemProperty("amqj.logging.level", "info");
- setBrokerOnlySystemProperty("root.logging.level", "info");
-
- startBroker();
-
- assertEquals("Log4j could not load desired configruation.",
- 0, findMatches("log4j:ERROR Could not read
configuration file from URL").size());
-
- assertEquals("Logging did not error as expected",
- 1, waitAndFindMatches("Logging configuration error:
unable to read file ").size());
-
-
- // Perfom some action on the broker to ensure that we hit the DEBUG
- // messages that we know are there. Though the current xml parsing
- // will generate a LOT of DEBUG on startup.
- Connection connection = getConnection();
-
- Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-
- Queue queue = session.createQueue(getTestQueueName());
- session.createConsumer(queue).close();
-
- int COUNT = 10;
- sendMessage(session, queue, COUNT);
-
- assertEquals(COUNT,drainQueue(queue));
-
- List<String> results = waitAndFindMatches("DEBUG");
- try
- {
- // Validation
-
- assertEquals("DEBUG messages should not be logged", 0,
results.size());
- }
- catch (AssertionFailedError afe)
- {
- System.err.println("Log Dump:");
- for (String log : results)
- {
- System.err.println(log);
- }
-
- if (results.size() == 0)
- {
- System.err.println("Monitored file contents:");
- System.err.println(_monitor.readFile());
- }
-
- throw afe;
- }
- }
- }
public void testStartupWithErroredChildrenCanBeConfigured() throws
Exception
{
@@ -209,7 +113,7 @@ public class BrokerStartupTest extends A
FileUtils.delete(brokerConfigFile, true);
}
- startBroker(port, null, null);
+ startBroker(port, null);
AMQConnectionURL url = new AMQConnectionURL(String.format("amqp://"
+ GUEST_USERNAME
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/LoggingManagementTest.java
Tue Jun 9 21:13:19 2015
@@ -40,7 +40,6 @@ public class LoggingManagementTest exten
private JMXTestUtils _jmxUtils;
private LoggingManagement _loggingManagement;
private LogMonitor _monitor;
- private File _logConfig;
@Override
public void setUp() throws Exception
@@ -52,12 +51,6 @@ public class LoggingManagementTest exten
// System test normally run with log for4j test config from beneath
test-profiles. We need to
// copy it as some of our tests write to this file.
- File tmpLogFile = File.createTempFile("log4j" + "." + getName(),
".xml");
- tmpLogFile.deleteOnExit();
- FileUtils.copy(new
File(System.getProperty("log4j.configuration.file")), tmpLogFile);
- setBrokerCommandLog4JFile(tmpLogFile);
- _logConfig = tmpLogFile;
-
super.setUp();
_jmxUtils.open();
@@ -67,7 +60,7 @@ public class LoggingManagementTest exten
public void startBroker() throws Exception
{
- super.startBroker(0, false, _logConfig.getAbsolutePath());
+ super.startBroker(0, false);
}
@Override
@@ -79,11 +72,6 @@ public class LoggingManagementTest exten
{
_jmxUtils.close();
}
-
- if (_logConfig != null)
- {
- _logConfig.delete();
- }
}
finally
{
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/BrokerCommandHelperTest.java
Tue Jun 9 21:13:19 2015
@@ -17,10 +17,6 @@
*/
package org.apache.qpid.test.utils;
-import static org.mockito.Mockito.*;
-
-import java.io.File;
-
public class BrokerCommandHelperTest extends QpidTestCase
{
private static final String PATH_TO_QPID_EXECUTABLE = "/path / to (/qpid";
@@ -31,49 +27,28 @@ public class BrokerCommandHelperTest ext
private static final String ARGUMENT_STORE_PATH_VALUE = "@STORE_PATH";
private static final String ARGUMENT_STORE_TYPE = "-st";
private static final String ARGUMENT_STORE_TYPE_VALUE = "@STORE_TYPE";
- private static final String ARGUMENT_LOG = "-l";
- private static final String ARGUMENT_LOG_VALUE = "@LOG_CONFIG_FILE";
private BrokerCommandHelper _brokerCommandHelper;
- private File _logConfigFile = mock(File.class);
-
@Override
public void setUp()
{
- when(_logConfigFile.getAbsolutePath()).thenReturn("log Config File");
_brokerCommandHelper = new BrokerCommandHelper("\"" +
PATH_TO_QPID_EXECUTABLE + "\" " + ARGUMENT_PORT + " "
+ ARGUMENT_PORT_VALUE + " " + ARGUMENT_STORE_PATH + " " +
ARGUMENT_STORE_PATH_VALUE + " " + ARGUMENT_STORE_TYPE
- + " " + ARGUMENT_STORE_TYPE_VALUE + " " + ARGUMENT_LOG + " " +
ARGUMENT_LOG_VALUE + " '" + ARGUMENT_WITH_SPACES
+ + " " + ARGUMENT_STORE_TYPE_VALUE + " '" +
ARGUMENT_WITH_SPACES
+ "'");
}
public void testGetBrokerCommand()
{
- String[] brokerCommand = _brokerCommandHelper.getBrokerCommand(1,
"path to config file", "json", _logConfigFile);
+ String[] brokerCommand = _brokerCommandHelper.getBrokerCommand(1,
"path to config file", "json");
String[] expected = { PATH_TO_QPID_EXECUTABLE, ARGUMENT_PORT, "1",
ARGUMENT_STORE_PATH, "path to config file",
- ARGUMENT_STORE_TYPE, "json", ARGUMENT_LOG, "\"log Config
File\"", ARGUMENT_WITH_SPACES };
- assertEquals("Unexpected broker command", expected.length,
brokerCommand.length);
- for (int i = 0; i < expected.length; i++)
- {
- assertEquals("Unexpected command part value at " + i,expected[i],
brokerCommand[i] );
- }
- }
-
- public void testRemoveBrokerCommandLog4JFile()
- {
- _brokerCommandHelper.removeBrokerCommandLog4JFile();
- String[] brokerCommand = _brokerCommandHelper.getBrokerCommand(1,
"configFile", "json", _logConfigFile);
-
- String[] expected = { PATH_TO_QPID_EXECUTABLE, ARGUMENT_PORT, "1",
ARGUMENT_STORE_PATH, "configFile",
ARGUMENT_STORE_TYPE, "json", ARGUMENT_WITH_SPACES };
-
assertEquals("Unexpected broker command", expected.length,
brokerCommand.length);
for (int i = 0; i < expected.length; i++)
{
assertEquals("Unexpected command part value at " + i,expected[i],
brokerCommand[i] );
}
}
-
}
Modified: qpid/java/trunk/test-profiles/JavaExcludes
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/JavaExcludes?rev=1684534&r1=1684533&r2=1684534&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/JavaExcludes (original)
+++ qpid/java/trunk/test-profiles/JavaExcludes Tue Jun 9 21:13:19 2015
@@ -37,7 +37,6 @@ org.apache.qpid.server.protocol.v0_8.Max
// QPID-6516: replace Log4J with LogBack
org.apache.qpid.server.jmx.mbeans.LoggingManagementMBeanTest#*
org.apache.qpid.systest.management.jmx.LoggingManagementTest#*
-org.apache.qpid.server.BrokerStartupTest#testInvalidLog4jConfigurationFile
org.apache.qpid.systest.rest.acl.LogViewerACLTest#*
org.apache.qpid.systest.rest.LogRecordsRestTest#*
org.apache.qpid.util.LogMonitorTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
