Cleaning up activemq-optional module. Prepare for including all tests.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@769332 13f79535-47bb-0310-9956-ffa450edef68

activemq-optional/pom.xml

@@ -93,6 +93,12 @@
       <artifactId>commons-httpclient</artifactId>
     </dependency>
     
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -126,17 +132,22 @@
       <artifactId>stax-api</artifactId>
       <optional>true</optional>
     </dependency>    
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>compile</scope>
       <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>
   </dependencies>
@@ -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>

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();
 

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;
 

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