activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r564271 [18/18] - in /activemq/trunk: activemq-core/src/main/java/org/apache/activemq/ activemq-core/src/main/java/org/apache/activemq/advisory/ activemq-core/src/main/java/org/apache/activemq/blob/ activemq-core/src/main/java/org/apache/ac...
Date Thu, 09 Aug 2007 16:40:08 GMT
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java?view=diff&rev=564271&r1=564270&r2=564271
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java
Thu Aug  9 09:37:49 2007
@@ -42,7 +42,7 @@
  */
 public class MessageIdList extends Assert implements MessageListener {
 
-    protected static final Log log = LogFactory.getLog(MessageIdList.class);
+    private static final Log LOG = LogFactory.getLog(MessageIdList.class);
 
     private List messageIds = new ArrayList();
     private Object semaphore;
@@ -101,16 +101,17 @@
     public void onMessage(Message message) {
         String id = null;
         try {
-            if (countDownLatch != null)
+            if (countDownLatch != null) {
                 countDownLatch.countDown();
+            }
 
             id = message.getJMSMessageID();
             synchronized (semaphore) {
                 messageIds.add(id);
                 semaphore.notifyAll();
             }
-            if (log.isDebugEnabled()) {
-                log.debug("Received message: " + message);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Received message: " + message);
             }
         } catch (JMSException e) {
             e.printStackTrace();
@@ -133,7 +134,7 @@
     }
 
     public void waitForMessagesToArrive(int messageCount) {
-        log.info("Waiting for " + messageCount + " message(s) to arrive");
+        LOG.info("Waiting for " + messageCount + " message(s) to arrive");
 
         long start = System.currentTimeMillis();
 
@@ -150,12 +151,12 @@
                     semaphore.wait(maximumDuration - duration);
                 }
             } catch (InterruptedException e) {
-                log.info("Caught: " + e);
+                LOG.info("Caught: " + e);
             }
         }
         long end = System.currentTimeMillis() - start;
 
-        log.info("End of wait for " + end + " millis and received: " + getMessageCount()
+ " messages");
+        LOG.info("End of wait for " + end + " millis and received: " + getMessageCount()
+ " messages");
     }
 
     /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java?view=diff&rev=564271&r1=564270&r2=564271
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
Thu Aug  9 09:37:49 2007
@@ -19,6 +19,9 @@
 import javax.jms.Connection;
 
 import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.test.retroactive.RetroactiveConsumerWithMessageQueryTest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * 
@@ -26,6 +29,8 @@
  * @version $Revision$
  */
 public class MultipleTestsWithEmbeddedBrokerTest extends EmbeddedBrokerTestSupport {
+    private static final Log LOG = LogFactory.getLog(MultipleTestsWithEmbeddedBrokerTest.class);
+
     protected Connection connection;
 
     public void test1() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java?view=diff&rev=564271&r1=564270&r2=564271
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
Thu Aug  9 09:37:49 2007
@@ -35,7 +35,7 @@
  */
 public class MultipleTestsWithSpringFactoryBeanTest extends TestCase {
     
-    protected static final Log log = LogFactory.getLog(MultipleTestsWithSpringFactoryBeanTest.class);
+    private static final Log LOG = LogFactory.getLog(MultipleTestsWithSpringFactoryBeanTest.class);
     
     protected AbstractApplicationContext context;
     protected BrokerService service;
@@ -48,7 +48,7 @@
     }
     
     protected void setUp() throws Exception {
-        log.info("### starting up the test case: " + getName());
+        LOG.info("### starting up the test case: " + getName());
         
         super.setUp();
         context = new ClassPathXmlApplicationContext("org/apache/activemq/xbean/spring2.xml");
@@ -59,7 +59,7 @@
         
         connection = createConnectionFactory().createConnection();
         connection.start();
-        log.info("### started up the test case: " + getName());
+        LOG.info("### started up the test case: " + getName());
     }
 
     protected void tearDown() throws Exception {
@@ -70,7 +70,7 @@
         context.close();
         super.tearDown();
         
-        log.info("### closed down the test case: " + getName());
+        LOG.info("### closed down the test case: " + getName());
     }
 
     protected ConnectionFactory createConnectionFactory() {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java?view=diff&rev=564271&r1=564270&r2=564271
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
Thu Aug  9 09:37:49 2007
@@ -42,7 +42,7 @@
  */
 public class XBeanConfigTest extends TestCase {
 
-    protected static final Log log = LogFactory.getLog(XBeanConfigTest.class);
+    private static final Log LOG = LogFactory.getLog(XBeanConfigTest.class);
 
     protected BrokerService brokerService;
     protected Broker broker;
@@ -62,9 +62,9 @@
         assertTrue("subscriptionRecoveryPolicy should be LastImageSubscriptionRecoveryPolicy:
" + subscriptionRecoveryPolicy,
                    subscriptionRecoveryPolicy instanceof LastImageSubscriptionRecoveryPolicy);
 
-        log.info("destination: " + topic);
-        log.info("dispatchPolicy: " + dispatchPolicy);
-        log.info("subscriptionRecoveryPolicy: " + subscriptionRecoveryPolicy);
+        LOG.info("destination: " + topic);
+        LOG.info("dispatchPolicy: " + dispatchPolicy);
+        LOG.info("subscriptionRecoveryPolicy: " + subscriptionRecoveryPolicy);
 
         topic = (Topic)broker.addDestination(context, new ActiveMQTopic("ORDERS.BOOKS"));
         dispatchPolicy = topic.getDispatchPolicy();
@@ -76,9 +76,9 @@
         TimedSubscriptionRecoveryPolicy timedSubcriptionPolicy = (TimedSubscriptionRecoveryPolicy)subscriptionRecoveryPolicy;
         assertEquals("getRecoverDuration()", 60000, timedSubcriptionPolicy.getRecoverDuration());
 
-        log.info("destination: " + topic);
-        log.info("dispatchPolicy: " + dispatchPolicy);
-        log.info("subscriptionRecoveryPolicy: " + subscriptionRecoveryPolicy);
+        LOG.info("destination: " + topic);
+        LOG.info("dispatchPolicy: " + dispatchPolicy);
+        LOG.info("subscriptionRecoveryPolicy: " + subscriptionRecoveryPolicy);
     }
 
     protected void setUp() throws Exception {
@@ -114,7 +114,7 @@
 
     protected BrokerService createBroker() throws Exception {
         String uri = "org/apache/activemq/xbean/activemq-policy.xml";
-        log.info("Loading broker configuration from the classpath with URI: " + uri);
+        LOG.info("Loading broker configuration from the classpath with URI: " + uri);
         return BrokerFactory.createBroker(new URI("xbean:" + uri));
     }
 

Modified: activemq/trunk/activemq-core/src/test/resources/login.config
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/login.config?view=diff&rev=564271&r1=564270&r2=564271
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/login.config (original)
+++ activemq/trunk/activemq-core/src/test/resources/login.config Thu Aug  9 09:37:49 2007
@@ -1,4 +1,4 @@
-/*
+/**
  * 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.
@@ -6,7 +6,7 @@
  * (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
+ *      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,

Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java?view=diff&rev=564271&r1=564270&r2=564271
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
(original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
Thu Aug  9 09:37:49 2007
@@ -29,7 +29,7 @@
     }
 
     protected void setUp() throws Exception {
-        MAX_WAIT = 2000;
+        maxWait = 2000;
         super.setUp();
     }
 



Mime
View raw message