From d16a6fc88328d600c6916fb4b6dc4e0c894ea7f9 Mon Sep 17 00:00:00 2001 From: "Timothy A. Bish" Date: Thu, 15 Nov 2012 16:01:18 +0000 Subject: [PATCH] Move test to client and remove an empty folder. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1409856 13f79535-47bb-0310-9956-ffa450edef68 --- .../activemq/usage/MemoryUsageTest.java | 0 .../src/test/resources/log4j.properties | 42 +++++++++++++++++++ 2 files changed, 42 insertions(+) rename {activemq-core => activemq-client}/src/test/java/org/apache/activemq/usage/MemoryUsageTest.java (100%) create mode 100755 activemq-client/src/test/resources/log4j.properties diff --git a/activemq-core/src/test/java/org/apache/activemq/usage/MemoryUsageTest.java b/activemq-client/src/test/java/org/apache/activemq/usage/MemoryUsageTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/usage/MemoryUsageTest.java rename to activemq-client/src/test/java/org/apache/activemq/usage/MemoryUsageTest.java diff --git a/activemq-client/src/test/resources/log4j.properties b/activemq-client/src/test/resources/log4j.properties new file mode 100755 index 0000000000..7cc19418fd --- /dev/null +++ b/activemq-client/src/test/resources/log4j.properties @@ -0,0 +1,42 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +# +# The logging properties used during tests.. +# +log4j.rootLogger=INFO, out, stdout + +#log4j.logger.org.apache.activemq.broker.scheduler=DEBUG +#log4j.logger.org.apache.activemq.network.DemandForwardingBridgeSupport=DEBUG +#log4j.logger.org.apache.activemq.transport.failover=TRACE +#log4j.logger.org.apache.activemq.store.jdbc=TRACE +#log4j.logger.org.apache.activemq.broker.region.cursors.AbstractStoreCursor=DEBUG +#log4j.logger.org.apache.activemq.store.jdbc.JDBCMessageStore=DEBUG + +# CONSOLE appender not used by default +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n + +# File appender +log4j.appender.out=org.apache.log4j.FileAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n +log4j.appender.out.file=target/activemq-test.log +log4j.appender.out.append=true