activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1390418 - in /activemq/trunk/activemq-leveldb: ./ src/main/scala/org/apache/activemq/leveldb/ src/test/scala/org/apache/activemq/leveldb/
Date Wed, 26 Sep 2012 11:50:48 GMT
Author: gtully
Date: Wed Sep 26 11:50:47 2012
New Revision: 1390418

URL: http://svn.apache.org/viewvc?rev=1390418&view=rev
Log:
polish pom and use of deprecated apis

Modified:
    activemq/trunk/activemq-leveldb/pom.xml
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala

Modified: activemq/trunk/activemq-leveldb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb/pom.xml?rev=1390418&r1=1390417&r2=1390418&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/pom.xml (original)
+++ activemq/trunk/activemq-leveldb/pom.xml Wed Sep 26 11:50:47 2012
@@ -322,6 +322,9 @@
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
           <failIfNoTests>false</failIfNoTests>
+          <excludes>
+            <exclude>**/EnqueueRateScenariosTest.*</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -416,16 +419,6 @@
           </execution>
         </executions>
         </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>always</forkMode>
-          <excludes>
-            <exclude>**/EnqueueRateScenariosTest.*</exclude>
-          </excludes>          
-        </configuration>
-      </plugin>
     </plugins>
   </build>  
 </project>

Modified: activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala?rev=1390418&r1=1390417&r2=1390418&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
(original)
+++ activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
Wed Sep 26 11:50:47 2012
@@ -31,7 +31,6 @@ import org.apache.activemq.leveldb.recor
 import util.TimeMetric
 import java.util.HashMap
 import collection.mutable.{HashSet, ListBuffer}
-import org.apache.activemq.thread.DefaultThreadPools
 
 case class MessageRecord(id:MessageId, data:Buffer, syncNeeded:Boolean) {
   var locator:(Long, Int) = _
@@ -297,7 +296,7 @@ class DelayableUOW(val manager:DBManager
       if( manager.asyncCapacityRemaining.addAndGet(-s) > 0 ) {
         asyncCapacityUsed = s
         countDownFuture.countDown
-        DefaultThreadPools.getDefaultTaskRunnerFactory.execute(^{
+        manager.parent.brokerService.getTaskRunnerFactory.execute(^{
           complete_listeners.foreach(_())
         })
       } else {
@@ -319,7 +318,7 @@ class DelayableUOW(val manager:DBManager
       } else {
         manager.uow_complete_latency.add(System.nanoTime() - disposed_at)
         countDownFuture.countDown
-        DefaultThreadPools.getDefaultTaskRunnerFactory.execute(^{
+        manager.parent.brokerService.getTaskRunnerFactory.execute(^{
           complete_listeners.foreach(_())
         })
       }

Modified: activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala?rev=1390418&r1=1390417&r2=1390418&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
(original)
+++ activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
Wed Sep 26 11:50:47 2012
@@ -38,7 +38,7 @@ class ActiveMQScenario extends JMSClient
   override protected def destination(i:Int):Destination = destination_type match {
     case "queue" => new ActiveMQQueue(indexed_destination_name(i))
     case "topic" => new ActiveMQTopic(indexed_destination_name(i))
-    case _ => error("Unsuported destination type: "+destination_type)
+    case _ => sys.error("Unsuported destination type: "+destination_type)
   }
 
 }

Modified: activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala?rev=1390418&r1=1390417&r2=1390418&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala
(original)
+++ activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala
Wed Sep 26 11:50:47 2012
@@ -40,7 +40,7 @@ abstract class JMSClientScenario extends
   def indexed_destination_name(i:Int) = destination_type match {
     case "queue" => queue_prefix+destination_name+"-"+(i%destination_count)
     case "topic" => topic_prefix+destination_name+"-"+(i%destination_count)
-    case _ => error("Unsuported destination type: "+destination_type)
+    case _ => sys.error("Unsuported destination type: "+destination_type)
   }
 
 



Mime
View raw message