activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r830393 [1/3] - in /activemq/sandbox/activemq-apollo: ./ activemq-all/ activemq-all/src/test/ide-resources/ activemq-all/src/test/java/org/apache/activemq/legacy/transport/ activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio...
Date Tue, 27 Oct 2009 23:14:44 GMT
Author: chirino
Date: Tue Oct 27 23:14:41 2009
New Revision: 830393

URL: http://svn.apache.org/viewvc?rev=830393&view=rev
Log:
- Upgraded to junit 4.7, removed testng dependency.
- adding log4j.properties for maven and ide testing.


Added:
    activemq/sandbox/activemq-apollo/activemq-all/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-all/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-bio/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-bio/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-bio/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-broker/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-broker/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-client/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-client/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-client/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-flow/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-flow/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-flow/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-jmx/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-jmx/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-jmx/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-kaha/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-kaha/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-kaha/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-network/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-network/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-network/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-openwire/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-openwire/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-openwire/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-protobuf/activemq-protobuf-test/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-protobuf/activemq-protobuf-test/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-protobuf/activemq-protobuf/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-protobuf/activemq-protobuf/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-queue/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-queue/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-queue/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-selector/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-selector/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-selector/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-spring/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-spring/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-spring/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-stomp/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-stomp/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-stomp/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-store/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-store/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-store/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-transport/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-transport/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-transport/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-util/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/activemq-util/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/activemq-util/src/test/resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/distribution/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/distribution/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/hawtdb/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/hawtdb/src/test/ide-resources/log4j.properties   (with props)
    activemq/sandbox/activemq-apollo/kahadb/src/test/ide-resources/
    activemq/sandbox/activemq-apollo/kahadb/src/test/ide-resources/log4j.properties   (with props)
Modified:
    activemq/sandbox/activemq-apollo/activemq-all/pom.xml
    activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java
    activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java
    activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java
    activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java
    activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java
    activemq/sandbox/activemq-apollo/activemq-all/src/test/resources/log4j.properties
    activemq/sandbox/activemq-apollo/activemq-broker/pom.xml
    activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java
    activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapTest.java
    activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/transport/vm/VMTransportTest.java
    activemq/sandbox/activemq-apollo/activemq-broker/src/test/resources/log4j.properties
    activemq/sandbox/activemq-apollo/activemq-jaxb/pom.xml
    activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
    activemq/sandbox/activemq-apollo/activemq-openwire/pom.xml
    activemq/sandbox/activemq-apollo/activemq-openwire/src/test/java/org/apache/activemq/openwire/BrokerTest.java
    activemq/sandbox/activemq-apollo/activemq-openwire/src/test/java/org/apache/activemq/openwire/BrokerTestScenario.java
    activemq/sandbox/activemq-apollo/activemq-openwire/src/test/java/org/apache/activemq/openwire/MarshallingBrokerTest.java
    activemq/sandbox/activemq-apollo/activemq-protobuf/activemq-protobuf/pom.xml
    activemq/sandbox/activemq-apollo/activemq-util/pom.xml
    activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/apollo/Combinator.java
    activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
    activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
    activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
    activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
    activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/TreeMapTest.java
    activemq/sandbox/activemq-apollo/activemq-util/src/test/java/org/apache/activemq/util/URISupportTest.java
    activemq/sandbox/activemq-apollo/hawtdb/src/test/resources/log4j.properties
    activemq/sandbox/activemq-apollo/kahadb/src/test/resources/log4j.properties
    activemq/sandbox/activemq-apollo/pom.xml

Modified: activemq/sandbox/activemq-apollo/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/pom.xml?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/pom.xml (original)
+++ activemq/sandbox/activemq-apollo/activemq-all/pom.xml Tue Oct 27 23:14:41 2009
@@ -125,12 +125,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>test</scope>
-      <classifier>jdk15</classifier>
-    </dependency>     
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Added: activemq/sandbox/activemq-apollo/activemq-all/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-all/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-all/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java Tue Oct 27 23:14:41 2009
@@ -19,41 +19,50 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
+import org.apache.activemq.apollo.Combinator.BeanFactory;
 import org.apache.activemq.openwire.BrokerTest;
 import org.apache.activemq.openwire.BrokerTestScenario;
 import org.apache.activemq.transport.TransportServer;
 
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public abstract class TransportBrokerTestSupport extends BrokerTest {
 
-    protected abstract String getBindLocation();
-
-    /**
-     * Need to enhance the BrokerTestScenario a bit to inject the wire format
-     */
-    @Override
-    public Object createBean() throws Exception {
-		BrokerTestScenario brokerTestScenario = new BrokerTestScenario() {
-			
-		    private TransportServer transnportServer;
-
-			@Override
-		    public TransportServer createTransnportServer() throws IOException, URISyntaxException {
-		    	transnportServer = super.createTransnportServer();
-				return transnportServer;
-		    }
-		    
-			@Override
-		    public String getConnectURI() {
-		    	return transnportServer.getConnectURI().toString();
-		    }
-
-			@Override
-			public String getBindURI() {
-				return getBindLocation();
-			}
-		    
-		};
-		return brokerTestScenario;
+    public static BeanFactory<BrokerTestScenario> transportScenerios(final String bindLocation) {
+        return transportScenerios(bindLocation, 4000);
     }
-
+    
+    public static BeanFactory<BrokerTestScenario> transportScenerios(final String bindLocation, final int maxWait) {
+        return new BeanFactory<BrokerTestScenario>() {
+            public BrokerTestScenario createBean() throws Exception {
+                BrokerTestScenario rc = new BrokerTestScenario() {
+                    private TransportServer transnportServer;
+
+                    @Override
+                    public TransportServer createTransnportServer() throws IOException, URISyntaxException {
+                        transnportServer = super.createTransnportServer();
+                        return transnportServer;
+                    }
+                    
+                    @Override
+                    public String getConnectURI() {
+                        return transnportServer.getConnectURI().toString();
+                    }
+
+                    @Override
+                    public String getBindURI() {
+                        return bindLocation;
+                    }
+                };
+                rc.maxWait = maxWait;
+                return rc;
+            }
+
+            public Class<BrokerTestScenario> getBeanClass() {
+                return BrokerTestScenario.class;
+            }
+        };
+    }
+    
 }

Modified: activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java Tue Oct 27 23:14:41 2009
@@ -17,13 +17,18 @@
 package org.apache.activemq.legacy.transport.nio;
 
 import org.apache.activemq.legacy.transport.TransportBrokerTestSupport;
-import org.testng.annotations.Test;
+import org.junit.BeforeClass;
+import org.junit.experimental.theories.Theories;
+import org.junit.runner.RunWith;
 
-@Test
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+@RunWith(Theories.class)
 public class NIOTransportBrokerTest extends TransportBrokerTestSupport {
 
-    protected String getBindLocation() {
-        return "nio://localhost:0";
-    }
-
+    @BeforeClass
+    static public void createScenarios() throws Exception {
+        SCENARIOS = combinations().asBeans(transportScenerios("ssl://localhost:0"));
+    }  
 }

Modified: activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java Tue Oct 27 23:14:41 2009
@@ -35,12 +35,22 @@
 import org.apache.activemq.apollo.broker.BrokerFactory;
 import org.apache.activemq.legacy.transport.TransportBrokerTestSupport;
 import org.apache.activemq.transport.TransportFactory;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.experimental.theories.Theories;
+import org.junit.runner.RunWith;
 
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+@RunWith(Theories.class)
+@Ignore
 public class SslBrokerServiceTest extends TransportBrokerTestSupport {
 
-    protected String getBindLocation() {
-        return "ssl://localhost:0";
-    }
+    @BeforeClass
+    static public void createScenarios() throws Exception {
+        SCENARIOS = combinations().asBeans(transportScenerios("ssl://localhost:0"));
+    }    
     
 //    @Override
 //    protected Broker createBroker() throws Exception {

Modified: activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportBrokerTest.java Tue Oct 27 23:14:41 2009
@@ -17,11 +17,14 @@
 package org.apache.activemq.legacy.transport.tcp;
 
 import org.apache.activemq.legacy.transport.TransportBrokerTestSupport;
-import org.apache.activemq.openwire.BrokerTestScenario;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-@Test
+import org.junit.BeforeClass;
+import org.junit.experimental.theories.Theories;
+import org.junit.runner.RunWith;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+@RunWith(Theories.class)
 public class SslTransportBrokerTest extends TransportBrokerTestSupport {
 
     public static final String KEYSTORE_TYPE = "jks";
@@ -29,12 +32,8 @@
     public static final String SERVER_KEYSTORE = "src/test/resources/server.keystore";
     public static final String TRUST_KEYSTORE = "src/test/resources/client.keystore";
 
-    protected String getBindLocation() {
-        return "ssl://localhost:0";
-    }
-
-    @BeforeTest
-    protected void setUp() throws Exception {
+    @BeforeClass
+    static public void createScenarios() throws Exception {
         System.setProperty("javax.net.ssl.trustStore", TRUST_KEYSTORE);
         System.setProperty("javax.net.ssl.trustStorePassword", PASSWORD);
         System.setProperty("javax.net.ssl.trustStoreType", KEYSTORE_TYPE);        
@@ -42,13 +41,8 @@
         System.setProperty("javax.net.ssl.keyStorePassword", PASSWORD);
         System.setProperty("javax.net.ssl.keyStoreType", KEYSTORE_TYPE);        
         //System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");        
-    }
 
-    @Override
-    public Object createBean() throws Exception {
-    	BrokerTestScenario scenario = (BrokerTestScenario) super.createBean();
-    	scenario.maxWait = 10000;
-		return scenario;
+        SCENARIOS = combinations().asBeans(transportScenerios("ssl://localhost:0", 10000));
     }
 
 }

Modified: activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TcpTransportBrokerTest.java Tue Oct 27 23:14:41 2009
@@ -17,21 +17,19 @@
 package org.apache.activemq.legacy.transport.tcp;
 
 import org.apache.activemq.legacy.transport.TransportBrokerTestSupport;
-import org.apache.activemq.openwire.BrokerTestScenario;
-import org.testng.annotations.Test;
+import org.junit.BeforeClass;
+import org.junit.experimental.theories.Theories;
+import org.junit.runner.RunWith;
 
-@Test
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+@RunWith(Theories.class)
 public class TcpTransportBrokerTest extends TransportBrokerTestSupport {
-
-    protected String getBindLocation() {
-        return "tcp://localhost:0";
-    }
-
-    @Override
-    public Object createBean() throws Exception {
-    	BrokerTestScenario scenario = (BrokerTestScenario) super.createBean();
-    	scenario.maxWait = 2000;
-		return scenario;
+    
+    @BeforeClass
+    static public void createScenarios() throws Exception {
+        SCENARIOS = combinations().asBeans(transportScenerios("tcp://localhost:0", 2000));
     }
-
+    
 }

Modified: activemq/sandbox/activemq-apollo/activemq-all/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-all/src/test/resources/log4j.properties?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-all/src/test/resources/log4j.properties (original)
+++ activemq/sandbox/activemq-apollo/activemq-all/src/test/resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -18,18 +18,18 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, out, stdout
+log4j.rootLogger=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
 
-log4j.logger.org.apache.activemq.spring=WARN
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=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
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Added: activemq/sandbox/activemq-apollo/activemq-bio/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-bio/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-bio/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-bio/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-bio/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-bio/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-bio/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-bio/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-bio/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-bio/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-broker/pom.xml?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-apollo/activemq-broker/pom.xml Tue Oct 27 23:14:41 2009
@@ -63,12 +63,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>test</scope>
-      <classifier>jdk15</classifier>
-    </dependency>
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Added: activemq/sandbox/activemq-apollo/activemq-broker/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-broker/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-broker/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-broker/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-broker/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java Tue Oct 27 23:14:41 2009
@@ -19,9 +19,13 @@
 import java.util.Set;
 
 import org.apache.activemq.util.buffer.AsciiBuffer;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
+import static org.junit.Assert.*;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public class PathMapMemoryTest {
 
     @Test()
@@ -45,7 +49,7 @@
                 PathMap<String> map = new PathMap<String>();
                 map.put(d1, "test");
             } catch (Throwable e) {
-                Assert.fail("Destination name too long: " + name + " : " + e);
+                fail(("Destination name too long: " + name + " : " + e));
             }
         }
     }
@@ -63,7 +67,7 @@
             AsciiBuffer queue = new AsciiBuffer("connection:"+i);
             map.remove(queue, value);
             Set<Object> set = map.get(queue);
-            Assert.assertTrue(set.isEmpty());
+            assertTrue(set.isEmpty());
         }
     }    
 

Modified: activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/path/PathMapTest.java Tue Oct 27 23:14:41 2009
@@ -24,9 +24,13 @@
 import java.util.Set;
 
 import org.apache.activemq.util.buffer.AsciiBuffer;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
+import static org.junit.Assert.*;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public class PathMapTest {
 
     protected AsciiBuffer d1 = createDestination("TEST.D1");
@@ -207,13 +211,13 @@
         PathMap<String> map = new PathMap<String>();
         put(map, "TEST.D1", v2);
 
-        Assert.assertEquals(map.getRootNode().getChildCount(), 1, "Root child count");
+        assertEquals("Root child count", 1, map.getRootNode().getChildCount());
 
         assertMapValue(map, "TEST.D1", v2);
 
         remove(map, "TEST.D1", v2);
 
-        Assert.assertEquals(map.getRootNode().getChildCount(), 0, "Root child count");
+        assertEquals("Root child count", 0, map.getRootNode().getChildCount());
         assertMapValue(map, "TEST.D1");
     }
 
@@ -350,7 +354,7 @@
         Set actualSet = map.get(destination);
         List actual = new ArrayList(actualSet);
         Collections.sort(actual);
-        Assert.assertEquals(actual, expectedList, ("map value for destinationName:  " + destination));
+        assertEquals(("map value for destinationName:  " + destination), expectedList, actual);
     }
 
     protected AsciiBuffer createDestination(String name) {

Modified: activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/transport/vm/VMTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/transport/vm/VMTransportTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/transport/vm/VMTransportTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-broker/src/test/java/org/apache/activemq/apollo/transport/vm/VMTransportTest.java Tue Oct 27 23:14:41 2009
@@ -21,12 +21,12 @@
 
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
- * 
- * @author chirino
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
 public class VMTransportTest {
 
@@ -38,16 +38,16 @@
 	public void autoCreateBroker() throws Exception {
 		Transport connect = TransportFactory.compositeConnect(new URI("vm://test1?wireFormat=mock"));
 		connect.start();
-		Assert.assertNotNull(connect);
+		assertNotNull(connect);
 		connect.stop();
 	}
 	
-	@Test(expectedExceptions={IOException.class})
+	@Test(expected=IOException.class)
 	public void noAutoCreateBroker() throws Exception {
 		TransportFactory.compositeConnect(new URI("vm://test2?create=false&wireFormat=mock"));
 	}
 	
-	@Test(expectedExceptions={IllegalArgumentException.class})
+	@Test(expected=IllegalArgumentException.class)
 	public void badOptions() throws Exception {
 		TransportFactory.compositeConnect(new URI("vm://test3?crazy-option=false&wireFormat=mock"));
 	}

Modified: activemq/sandbox/activemq-apollo/activemq-broker/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-broker/src/test/resources/log4j.properties?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-broker/src/test/resources/log4j.properties (original)
+++ activemq/sandbox/activemq-apollo/activemq-broker/src/test/resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -18,16 +18,18 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, out, stdout
+log4j.rootLogger=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
 
-# 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
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
 
-# 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
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Added: activemq/sandbox/activemq-apollo/activemq-client/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-client/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-client/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-client/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-client/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-client/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-client/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-client/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-client/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-client/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-dispatcher/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-flow/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-flow/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-flow/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-flow/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-flow/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-flow/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-flow/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-flow/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-flow/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-flow/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/activemq-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-jaxb/pom.xml?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-jaxb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo/activemq-jaxb/pom.xml Tue Oct 27 23:14:41 2009
@@ -72,12 +72,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>test</scope>
-      <classifier>jdk15</classifier>
-    </dependency>
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Added: activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java (original)
+++ activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/java/org/apache/activemq/apollo/jaxb/JAXBConfigTest.java Tue Oct 27 23:14:41 2009
@@ -29,9 +29,11 @@
 import org.apache.activemq.dispatch.AbstractPooledDispatcher;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
 public class JAXBConfigTest extends TestCase {
 
     private static final Log LOG = LogFactory.getLog(JAXBConfigTest.class);
@@ -43,22 +45,22 @@
 		Broker broker = BrokerFactory.createBroker(uri);
 		
 		AbstractPooledDispatcher p = (AbstractPooledDispatcher)broker.getDispatcher();
-		Assert.assertEquals(p.getSize(), 4);
-		Assert.assertEquals(p.getName(), "test dispatcher");
+		assertEquals(4, p.getSize());
+		assertEquals("test dispatcher", p.getName());
 		
 		
-		Assert.assertEquals(broker.getTransportServers().size(), 1);
+		assertEquals(1, broker.getTransportServers().size());
 		
 		ArrayList<String> expected = new ArrayList<String>();
 		expected.add("pipe://test1");
 		expected.add("tcp://127.0.0.1:61616");
-		Assert.assertEquals(broker.getConnectUris(), expected);
+		assertEquals(expected, broker.getConnectUris());
 		
-		Assert.assertEquals(broker.getVirtualHosts().size(), 2);
+		assertEquals(2, broker.getVirtualHosts().size());
 		
-		Assert.assertNotNull(broker.getDefaultVirtualHost().getDatabase());
-		Assert.assertNotNull(broker.getDefaultVirtualHost().getDatabase().getStore());
-		Assert.assertTrue((broker.getDefaultVirtualHost().getDatabase().getStore() instanceof MemoryStore));
+		assertNotNull(broker.getDefaultVirtualHost().getDatabase());
+		assertNotNull(broker.getDefaultVirtualHost().getDatabase().getStore());
+		assertTrue((broker.getDefaultVirtualHost().getDatabase().getStore() instanceof MemoryStore));
 		
 	}
 	
@@ -73,7 +75,7 @@
 			failed = true;
 		}
 		if (!failed) {
-			Assert.fail("Creating broker from non-existing url does not throw an exception!");
+			fail("Creating broker from non-existing url does not throw an exception!");
 		}
 		failed = false;
 		//non-existent file
@@ -84,7 +86,7 @@
 			failed = true;
 		}
 		if (!failed) {
-			Assert.fail("Creating broker from non-existing url does not throw an exception!");
+			fail("Creating broker from non-existing url does not throw an exception!");
 		}
 		//non-existent url
 		try {
@@ -94,7 +96,7 @@
 			failed = true;
 		}
 		if (!failed) {
-			Assert.fail("Creating broker from non-existing url does not throw an exception!");
+			fail("Creating broker from non-existing url does not throw an exception!");
 		}		
 		// regular file
 		URI uri = new URI("jaxb:" + Thread.currentThread().getContextClassLoader().getResource("org/apache/activemq/apollo/jaxb/testUris.xml"));

Added: activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-jaxb/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-jmx/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-jmx/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-jmx/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-jmx/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-jmx/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-jmx/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-jmx/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-jmx/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-jmx/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-jmx/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-kaha/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-kaha/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-kaha/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-kaha/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-kaha/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-kaha/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-kaha/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-kaha/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-kaha/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-kaha/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-network/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-network/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-network/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-network/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-network/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/sandbox/activemq-apollo/activemq-network/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-network/src/test/resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-network/src/test/resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-network/src/test/resources/log4j.properties Tue Oct 27 23:14:41 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=WARN, console, file
+log4j.logger.org.apache.activemq=INFO 
+
+# Console will only display warnnings
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m%n
+log4j.appender.console.threshold=WARN
+
+# File appender will contain all info messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true

Propchange: activemq/sandbox/activemq-apollo/activemq-network/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/sandbox/activemq-apollo/activemq-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-openwire/pom.xml?rev=830393&r1=830392&r2=830393&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-openwire/pom.xml (original)
+++ activemq/sandbox/activemq-apollo/activemq-openwire/pom.xml Tue Oct 27 23:14:41 2009
@@ -76,12 +76,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>test</scope>
-      <classifier>jdk15</classifier>
-    </dependency>    
-    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>test</scope>

Added: activemq/sandbox/activemq-apollo/activemq-openwire/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo/activemq-openwire/src/test/ide-resources/log4j.properties?rev=830393&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo/activemq-openwire/src/test/ide-resources/log4j.properties (added)
+++ activemq/sandbox/activemq-apollo/activemq-openwire/src/test/ide-resources/log4j.properties Tue Oct 27 23:14:41 2009
@@ -0,0 +1,27 @@
+## ------------------------------------------------------------------------
+## 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 for ide testing, We want to see 
+# info level output in the console.
+#
+log4j.rootLogger=WARN, console
+log4j.logger.org.apache.activemq=INFO
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %m%n
\ No newline at end of file

Propchange: activemq/sandbox/activemq-apollo/activemq-openwire/src/test/ide-resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message