You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/04/28 13:04:24 UTC
svn commit: r769332 - in /activemq/trunk/activemq-optional: pom.xml
src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
src/test/resources/log4j.properties
Author: dejanb
Date: Tue Apr 28 11:04:23 2009
New Revision: 769332
URL: http://svn.apache.org/viewvc?rev=769332&view=rev
Log:
Cleaning up activemq-optional module. Prepare for including all tests.
Added:
activemq/trunk/activemq-optional/src/test/resources/log4j.properties
Modified:
activemq/trunk/activemq-optional/pom.xml
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=769332&r1=769331&r2=769332&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Tue Apr 28 11:04:23 2009
@@ -92,6 +92,12 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -126,7 +132,6 @@
<artifactId>stax-api</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -134,11 +139,17 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -148,13 +159,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <includes>
- <include>**/Nothing</include>
- <!--
- <include>**/*Test.*</include>
- -->
- </includes>
<excludes>
+ <exclude>**/http/*</exclude>
+ <exclude>**/https/*</exclude>
</excludes>
</configuration>
</plugin>
Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java?rev=769332&r1=769331&r2=769332&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java Tue Apr 28 11:04:23 2009
@@ -41,7 +41,7 @@
MessageConsumer info;
MessageConsumer debug;
MessageConsumer warn;
- ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
+ ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false&broker.useJmx=false");
Connection conn = factory.createConnection();
conn.start();
Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java?rev=769332&r1=769331&r2=769332&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java Tue Apr 28 11:04:23 2009
@@ -38,7 +38,7 @@
* @version $Revision$
*/
public class XStreamTransformTest extends TestCase {
- protected ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+ protected ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false&broker.useJmx=false");
protected Connection connection;
protected long timeout = 5000;
Added: activemq/trunk/activemq-optional/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/resources/log4j.properties?rev=769332&view=auto
==============================================================================
--- activemq/trunk/activemq-optional/src/test/resources/log4j.properties (added)
+++ activemq/trunk/activemq-optional/src/test/resources/log4j.properties Tue Apr 28 11:04:23 2009
@@ -0,0 +1,35 @@
+## ---------------------------------------------------------------------------
+## 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.spring=WARN
+
+# 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
+
+# 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.file=target/activemq-test.log
+log4j.appender.out.append=true
\ No newline at end of file