activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r979923 - in /activemq/activemq-apollo/trunk: ./ apache-activemq-apollo/ apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ apollo-scala/ apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/ apollo-store/src/test/scala...
Date Wed, 28 Jul 2010 01:31:38 GMT
Author: chirino
Date: Wed Jul 28 01:31:38 2010
New Revision: 979923

URL: http://svn.apache.org/viewvc?rev=979923&view=rev
Log:
fixing some warnings and settings versions

Modified:
    activemq/activemq-apollo/trunk/apache-activemq-apollo/pom.xml   (contents, props changed)
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
    activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apache-activemq-apollo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apache-activemq-apollo/pom.xml?rev=979923&r1=979922&r2=979923&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apache-activemq-apollo/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apache-activemq-apollo/pom.xml Wed Jul 28 01:31:38 2010
@@ -32,7 +32,7 @@
   <name>${artifactId}</name>
 
   <properties>
-    <karaf.version>1.99.0-SNAPSHOT</karaf.version>
+    <karaf.version>2.0.0</karaf.version>
   </properties>
 
   <dependencies>

Propchange: activemq/activemq-apollo/trunk/apache-activemq-apollo/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala?rev=979923&r1=979922&r2=979923&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
Wed Jul 28 01:31:38 2010
@@ -221,7 +221,7 @@ class VirtualHost(val broker: Broker, va
 
         // For the topics, just collocate the producers onto the first consumer's
         // thread.
-        node.broadcast_consumers.firstOption.foreach{ consumer =>
+        node.broadcast_consumers.headOption.foreach{ consumer =>
           node.broadcast_producers.foreach { r=>
             r.producer.collocate(consumer.dispatchQueue)
           }
@@ -234,7 +234,7 @@ class VirtualHost(val broker: Broker, va
             // Collocate the queue's with the first consumer
             // TODO: change this so it collocates with the fastest consumer.
 
-            queue.all_subscriptions.firstOption.map( _._1 ).foreach { consumer=>
+            queue.all_subscriptions.headOption.map( _._1 ).foreach { consumer=>
               queue.collocate( consumer.dispatchQueue )
             }
 

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=979923&r1=979922&r2=979923&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Wed Jul 28 01:31:38 2010
@@ -32,6 +32,25 @@
   <name>${artifactId}</name>
   <description>Holds the common Maven settings for Scala based modules.</description>
   
+ <dependencies>
+
+    <!-- Scala Support: this needs to be copied into every scala project -->
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <scope>compile</scope>
+      <version>${scala-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-compiler</artifactId>
+      <version>${scala-version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+
+  </dependencies>
+  
   <build>
   
     <defaultGoal>install</defaultGoal>

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala?rev=979923&r1=979922&r2=979923&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
Wed Jul 28 01:31:38 2010
@@ -474,6 +474,7 @@ class StompProtocolHandler extends Proto
                   case Some(queue:Queue) =>
                     queue.bind(consumer::Nil)
                     consumer.release
+                  case None => throw new RuntimeException("case not yet implemented.")
                 }
               }
             }

Modified: activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala?rev=979923&r1=979922&r2=979923&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
Wed Jul 28 01:31:38 2010
@@ -23,7 +23,6 @@ import java.util.concurrent.{TimeUnit, C
 import org.scalatest.{BeforeAndAfterEach, BeforeAndAfterAll}
 import collection.mutable.ListBuffer
 import java.util.concurrent.atomic.{AtomicLong, AtomicInteger, AtomicBoolean}
-import org.apache.activemq.apollo.store.{Store, QueueEntryRecord, QueueRecord, MessageRecord}
 import org.apache.activemq.apollo.util.{LoggingTracker, FunSuiteSupport, LongCounter}
 
 /**

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=979923&r1=979922&r2=979923&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Wed Jul 28 01:31:38 2010
@@ -44,7 +44,7 @@
 
     <!-- dependencies that track scala version changes -->
     <scala-version>2.8.0</scala-version>
-    <scalatest-version>1.2-for-scala-2.8.0.final-SNAPSHOT</scalatest-version>
+    <scalatest-version>1.2</scalatest-version>
     <cascal-version>1.3-SNAPSHOT</cascal-version>
     
     <servicemix.kernel.version>1.1.0</servicemix.kernel.version>
@@ -100,7 +100,7 @@
     <felix-version>1.0.0</felix-version>
 
     <hawtdispatch-version>1.0</hawtdispatch-version>
-    <hawtdb-version>1.3-SNAPSHOT</hawtdb-version>
+    <hawtdb-version>1.2</hawtdb-version>
     <hawtbuf-version>1.1</hawtbuf-version>
     
     <jetty-version>6.1.22</jetty-version>



Mime
View raw message