Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polish pom and use of deprecated apis 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390418 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2012-09-26 11:50:47 +00:00
parent 9583d9af9f
commit effc8b9b89
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activemq-leveldb/pom.xml
View File

@ -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>

5
activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
View File

@ -31,7 +31,6 @@ import org.apache.activemq.leveldb.record.{SubscriptionRecord, CollectionRecord}
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) extends BaseRetained {
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) extends BaseRetained {
} else {
manager.uow_complete_latency.add(System.nanoTime() - disposed_at)
countDownFuture.countDown
DefaultThreadPools.getDefaultTaskRunnerFactory.execute(^{
manager.parent.brokerService.getTaskRunnerFactory.execute(^{
complete_listeners.foreach(_())
})
}

2
activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
View File

@ -38,7 +38,7 @@ class ActiveMQScenario extends JMSClientScenario {
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)
}
}

2
activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala
View File

@ -40,7 +40,7 @@ abstract class JMSClientScenario extends Scenario {
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)
}