activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [2/5] activemq-6 git commit: Fixing Logger errors on the testsuite
Date Mon, 09 Mar 2015 09:25:09 GMT
Fixing Logger errors on the testsuite

Fixing the classpath so some tests would find the LogManager configured
Fixing the dependency on the AssertionLoggerHandler so all the tests could also see it without
further errors


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/11dadb5a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/11dadb5a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/11dadb5a

Branch: refs/heads/master
Commit: 11dadb5a2a22a0287f99ca836cbb60125f443896
Parents: d101bcb
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Mar 6 23:15:07 2015 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Fri Mar 6 23:29:15 2015 -0500

----------------------------------------------------------------------
 activemq-commons/pom.xml                        |   5 +
 .../activemq/utils/AssertionLoggerHandler.java  | 145 +++++++++++++++++
 .../activemq-amqp-protocol/pom.xml              |  14 ++
 activemq-protocols/activemq-proton-plug/pom.xml |  16 ++
 .../WrongRoleFileConfigurationParserTest.java   |   2 +-
 .../tests/logging/AssertionLoggerHandler.java   | 159 -------------------
 .../src/test/resources/logging.properties       |   2 +-
 activemq-service-extensions/pom.xml             |  16 ++
 activemq-web/pom.xml                            |  16 ++
 tests/config/logging.properties                 |   2 +-
 tests/config/logging.properties.trace           |   2 +-
 tests/extra-tests/pom.xml                       |   7 +
 tests/integration-tests/pom.xml                 |  10 ++
 .../tests/integration/client/PagingTest.java    |   2 +-
 .../server/AddressFullLoggingTest.java          |   2 +-
 .../integration/server/FileLockTimeoutTest.java |   2 +-
 .../integration/server/SimpleStartStopTest.java |   2 +-
 tests/joram-tests/pom.xml                       |   9 ++
 tests/performance-tests/pom.xml                 |   9 ++
 tests/soak-tests/pom.xml                        |   9 ++
 tests/stress-tests/pom.xml                      |   9 ++
 tests/timing-tests/pom.xml                      |   9 ++
 tests/unit-tests/pom.xml                        |   9 ++
 23 files changed, 291 insertions(+), 167 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-commons/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml
index 2d1d754..1296b07 100644
--- a/activemq-commons/pom.xml
+++ b/activemq-commons/pom.xml
@@ -37,6 +37,11 @@
          <artifactId>jboss-logging-processor</artifactId>
       </dependency>
       <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
       </dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java
----------------------------------------------------------------------
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java
b/activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java
new file mode 100644
index 0000000..109617c
--- /dev/null
+++ b/activemq-commons/src/main/java/org/apache/activemq/utils/AssertionLoggerHandler.java
@@ -0,0 +1,145 @@
+/**
+ * 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.
+ */
+package org.apache.activemq.utils;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
+import org.jboss.logmanager.ExtHandler;
+import org.jboss.logmanager.ExtLogRecord;
+
+/**
+ * This class contains a tool where programs could intercept for LogMessage given an interval
of time between {@link #startCapture()}
+ * and {@link #stopCapture()}
+ * <p/>
+ * Be careful with this use as this is intended for testing only (such as testcases) *
+ *
+ * @author <a href="mailto:ehugonne@redhat.com">Emmanuel Hugonnet</a> (c) 2013
Red Hat, inc.
+ */
+public class AssertionLoggerHandler extends ExtHandler
+{
+
+   private static final Map<String, ExtLogRecord> messages = new ConcurrentHashMap<>();
+   private static boolean capture = false;
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public void flush()
+   {
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public void close() throws SecurityException
+   {
+   }
+
+   @Override
+   protected void doPublish(final ExtLogRecord record)
+   {
+      if (capture)
+      {
+         messages.put(record.getFormattedMessage(), record);
+      }
+   }
+
+
+   /**
+    * is there any record matching Level?
+    *
+    * @param level
+    * @return
+    */
+   public static boolean hasLevel(Level level)
+   {
+      for (ExtLogRecord record : messages.values())
+      {
+         if (record.getLevel().equals(level))
+         {
+            return true;
+         }
+      }
+
+      return false;
+   }
+
+   /**
+    * Find a line that contains the parameters passed as an argument
+    *
+    * @param text
+    * @return
+    */
+   public static boolean findText(final String... text)
+   {
+      for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet())
+      {
+         String key = entry.getKey();
+         boolean found = true;
+
+         for (String txtCheck : text)
+         {
+            found = key.contains(txtCheck);
+            if (!found)
+            {
+               // If the main log message doesn't contain what we're looking for let's look
in the message from the exception (if there is one).
+               Throwable throwable = entry.getValue().getThrown();
+               if (throwable != null && throwable.getMessage() != null)
+               {
+                  found = throwable.getMessage().contains(txtCheck);
+                  if (!found)
+                  {
+                     break;
+                  }
+               }
+               else
+               {
+                  break;
+               }
+            }
+         }
+
+         if (found)
+         {
+            return true;
+         }
+      }
+
+      return false;
+   }
+
+   public static final void clear()
+   {
+      messages.clear();
+   }
+
+   public static final void startCapture()
+   {
+      clear();
+      capture = true;
+   }
+
+   public static final void stopCapture()
+   {
+      capture = false;
+      clear();
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-protocols/activemq-amqp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml
index 6f6d68b..11993b8 100644
--- a/activemq-protocols/activemq-amqp-protocol/pom.xml
+++ b/activemq-protocols/activemq-amqp-protocol/pom.xml
@@ -48,6 +48,20 @@
       <!--
           JBoss Logging
       -->
+
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-protocols/activemq-proton-plug/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml
index e241126..cc545b2 100644
--- a/activemq-protocols/activemq-proton-plug/pom.xml
+++ b/activemq-protocols/activemq-proton-plug/pom.xml
@@ -48,6 +48,22 @@
       <!--
           JBoss Logging
       -->
+
+
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
index 0773d3f..b95ec5c 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.activemq.core.deployers.impl.FileConfigurationParser;
-import org.apache.activemq.tests.logging.AssertionLoggerHandler;
+import org.apache.activemq.utils.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.UnitTestCase;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java
b/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java
deleted file mode 100644
index 8188495..0000000
--- a/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * 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.
- */
-package org.apache.activemq.tests.logging;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
-import org.jboss.logmanager.ExtHandler;
-import org.jboss.logmanager.ExtLogRecord;
-import org.junit.Assert;
-
-/**
- * @author <a href="mailto:ehugonne@redhat.com">Emmanuel Hugonnet</a> (c) 2013
Red Hat, inc.
- */
-public class AssertionLoggerHandler extends ExtHandler
-{
-
-   private static final Map<String, ExtLogRecord> messages = new ConcurrentHashMap<>();
-   private static boolean capture = false;
-
-   /**
-    * {@inheritDoc}
-    */
-   @Override
-   public void flush()
-   {
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   @Override
-   public void close() throws SecurityException
-   {
-   }
-
-   @Override
-   protected void doPublish(final ExtLogRecord record)
-   {
-      if (capture)
-      {
-         messages.put(record.getFormattedMessage(), record);
-      }
-   }
-
-
-   /**
-    * is there any record matching Level?
-     * @param level
-    * @return
-    */
-   public static boolean hasLevel(Level level)
-   {
-      for (ExtLogRecord record : messages.values())
-      {
-         if (record.getLevel().equals(level))
-         {
-            return true;
-         }
-      }
-
-      return false;
-   }
-
-   /**
-    * Find a line that contains the parameters passed as an argument
-    *
-    * @param text
-    * @return
-    */
-   public static boolean findText(final String... text)
-   {
-      for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet())
-      {
-         String key = entry.getKey();
-         boolean found = true;
-
-         for (String txtCheck : text)
-         {
-            found = key.contains(txtCheck);
-            if (!found)
-            {
-               // If the main log message doesn't contain what we're looking for let's look
in the message from the exception (if there is one).
-               Throwable throwable = entry.getValue().getThrown();
-               if (throwable != null && throwable.getMessage() != null)
-               {
-                  found = throwable.getMessage().contains(txtCheck);
-                  if (!found)
-                  {
-                     break;
-                  }
-               }
-               else
-               {
-                  break;
-               }
-            }
-         }
-
-         if (found)
-         {
-            return true;
-         }
-      }
-
-      return false;
-   }
-
-   public static void assertMessageWasLoggedWithLevel(String expectedMessage, Level expectedLevel)
-   {
-      if (!messages.containsKey(expectedMessage))
-      {
-         throw new AssertionError((Arrays.toString(messages.keySet().toArray())));
-      }
-      Assert.assertEquals(expectedLevel, messages.get(expectedMessage).getLevel());
-   }
-
-   public static void assertMessageWasLoggedWithLevel(String assertionMessage, String expectedMessage,
Level expectedLevel)
-   {
-      if (!messages.containsKey(expectedMessage))
-      {
-         throw new AssertionError(assertionMessage);
-      }
-      Assert.assertEquals(assertionMessage, expectedLevel, messages.get(expectedMessage).getLevel());
-   }
-
-   public static final void clear()
-   {
-      messages.clear();
-   }
-
-   public static final void startCapture()
-   {
-      clear();
-      capture = true;
-   }
-
-   public static final void stopCapture()
-   {
-      capture = false;
-      clear();
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-server/src/test/resources/logging.properties
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/logging.properties b/activemq-server/src/test/resources/logging.properties
index 4b42bc4..1ac02cc 100644
--- a/activemq-server/src/test/resources/logging.properties
+++ b/activemq-server/src/test/resources/logging.properties
@@ -45,7 +45,7 @@ handler.FILE.formatter=PATTERN
 
 
 # Console handler configuration
-handler.TEST=org.apache.activemq.tests.logging.AssertionLoggerHandler
+handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler
 handler.TEST.level=TRACE
 handler.TEST.formatter=PATTERN
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-service-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/pom.xml b/activemq-service-extensions/pom.xml
index 8fd86d0..da50e32 100644
--- a/activemq-service-extensions/pom.xml
+++ b/activemq-service-extensions/pom.xml
@@ -55,6 +55,22 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
+
+
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+
+
    </dependencies>
 
    <properties>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/activemq-web/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 9b99cf9..53b3166 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -56,6 +56,22 @@
          <artifactId>jboss-logmanager</artifactId>
          <scope>test</scope>
       </dependency>
+
+
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+
+
    </dependencies>
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/config/logging.properties
----------------------------------------------------------------------
diff --git a/tests/config/logging.properties b/tests/config/logging.properties
index fb5d487..3062239 100644
--- a/tests/config/logging.properties
+++ b/tests/config/logging.properties
@@ -51,7 +51,7 @@ handler.FILE.fileName=target/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Console handler configuration
-handler.TEST=org.apache.activemq.tests.logging.AssertionLoggerHandler
+handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler
 handler.TEST.level=TRACE
 handler.TEST.formatter=PATTERN
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/config/logging.properties.trace
----------------------------------------------------------------------
diff --git a/tests/config/logging.properties.trace b/tests/config/logging.properties.trace
index bc3b050..c6c948d 100644
--- a/tests/config/logging.properties.trace
+++ b/tests/config/logging.properties.trace
@@ -53,7 +53,7 @@ handler.FILE.fileName=target/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Console handler configuration
-handler.TEST=org.apache.activemq.tests.logging.AssertionLoggerHandler
+handler.TEST=org.apache.activemq.utils.AssertionLoggerHandler
 handler.TEST.level=TRACE
 handler.TEST.formatter=PATTERN
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 3329bf3..b439ae8 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -169,6 +169,13 @@
          <artifactId>junit</artifactId>
       </dependency>
 
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
 
 
       <!-- Needed for JMS Bridge Tests -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 3c32bfe..93b8f97 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -223,6 +223,16 @@
          <version>1.0.1</version>
          <scope>test</scope>
       </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
+
    </dependencies>
 
    <build>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
index 0e4751d..4e53b91 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java
@@ -73,7 +73,7 @@ import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
 import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
 import org.apache.activemq.core.settings.impl.AddressSettings;
 import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.logging.AssertionLoggerHandler;
+import org.apache.activemq.utils.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.apache.activemq.tests.util.UnitTestCase;
 import org.junit.Assert;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
index b887a07..7d73029 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.api.core.client.ServerLocator;
 import org.apache.activemq.core.server.ActiveMQServer;
 import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
 import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.tests.logging.AssertionLoggerHandler;
+import org.apache.activemq.utils.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.junit.AfterClass;
 import org.junit.Assert;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
index 588feb6..1f295d3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/FileLockTimeoutTest.java
@@ -27,7 +27,7 @@ import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration;
 import org.apache.activemq.core.server.ActiveMQServer;
 import org.apache.activemq.core.server.JournalType;
 import org.apache.activemq.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.tests.logging.AssertionLoggerHandler;
+import org.apache.activemq.utils.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.junit.AfterClass;
 import org.junit.Assert;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
index 265cb16..b5386c5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/SimpleStartStopTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds;
 import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.tests.logging.AssertionLoggerHandler;
+import org.apache.activemq.utils.AssertionLoggerHandler;
 import org.apache.activemq.tests.util.ServiceTestBase;
 import org.jboss.logmanager.Level;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/joram-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index 81c0fd3..05d7e65 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -79,6 +79,15 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
 
    <build>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index 3e6dc27..5e3c3f0 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -101,6 +101,15 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
 
    <build>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/soak-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index a789581..4e9d351 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -112,6 +112,15 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
 
    <build>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/stress-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index b51dbbf..fb71b42 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -112,6 +112,15 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
 
    <build>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/timing-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index 7a1def1..7d95726 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -90,6 +90,15 @@
          <groupId>org.apache.geronimo.specs</groupId>
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
 
    <build>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/11dadb5a/tests/unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 87a4fb2..39927ef 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -94,6 +94,15 @@
             <groupId>org.jboss.logmanager</groupId>
             <artifactId>jboss-logmanager</artifactId>
       </dependency>
+
+      <!-- this is for the log assertion -->
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
 
    <build>


Mime
View raw message