diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index c8dc378fb4..34ec9ca526 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -92,6 +92,12 @@
commons-httpclient
commons-httpclient
+
+
+ commons-logging
+ commons-logging
+ test
+
junit
@@ -126,19 +132,24 @@
stax-api
true
-
log4j
log4j
compile
true
+
+ org.springframework
+ spring-beans
+ test
+
+
org.codehaus.jettison
jettison
- 1.0
+ 1.1
test
-
+
@@ -148,13 +159,9 @@
maven-surefire-plugin
-
- **/Nothing
-
-
+ **/http/*
+ **/https/*
diff --git a/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java b/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
index 790a6d40bb..636be9152f 100644
--- a/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
+++ b/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
@@ -41,7 +41,7 @@ public class JmsLogAppenderTest extends TestCase {
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();
diff --git a/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java b/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
index 3b10c33c5d..03059fd2c1 100644
--- a/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
+++ b/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
@@ -38,7 +38,7 @@ import static org.apache.activemq.util.xstream.XStreamMessageTransformer.Message
* @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;
diff --git a/activemq-optional/src/test/resources/log4j.properties b/activemq-optional/src/test/resources/log4j.properties
new file mode 100644
index 0000000000..0488612705
--- /dev/null
+++ b/activemq-optional/src/test/resources/log4j.properties
@@ -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