activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961135 - in /activemq/sandbox/activemq-apollo-actor: ./ activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/ activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/ activemq-broker/src/test/scala/org/apache/act...
Date Wed, 07 Jul 2010 04:08:49 GMT
Author: chirino
Date: Wed Jul  7 04:08:48 2010
New Revision: 961135

URL: http://svn.apache.org/viewvc?rev=961135&view=rev
Log:
got build passing without failures.

Removed:
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/SharedQueueTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBManagerBenchmark.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/scala/org/apache/activemq/broker/store/hawtdb/HawtDBManagerTest.java
Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/transport/vm/VMTransportTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java
    activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml
    activemq/sandbox/activemq-apollo-actor/pom.xml

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala?rev=961135&r1=961134&r2=961135&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/transport/vm/VMTransport.scala
Wed Jul  7 04:08:48 2010
@@ -158,8 +158,8 @@ class VMTransportFactory extends PipeTra
       verify(configure(transport, options), options)
 
     } catch {
-      //      case e:URISyntaxException=>
-      //  			throw IOExceptionSupport.create(e)
+      case e:IllegalArgumentException=>
+        throw e
       case e: Exception =>
         throw IOExceptionSupport.create(e)
     }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/transport/vm/VMTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/transport/vm/VMTransportTest.java?rev=961135&r1=961134&r2=961135&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/transport/vm/VMTransportTest.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/transport/vm/VMTransportTest.java
Wed Jul  7 04:08:48 2010
@@ -20,6 +20,7 @@ import java.io.IOException;
 
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportFactory;
+import org.fusesource.hawtdispatch.Dispatch;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -36,6 +37,7 @@ public class VMTransportTest {
 	@Test()
 	public void autoCreateBroker() throws Exception {
 		Transport connect = TransportFactory.connect("vm://test1?wireFormat=mock");
+        connect.setDispatchQueue(Dispatch.createQueue());
 		connect.start();
 		assertNotNull(connect);
 		connect.stop();

Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala?rev=961135&r1=961134&r2=961135&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/src/main/scala/org/apache/activemq/broker/store/cassandra/CassandraStore.scala
Wed Jul  7 04:08:48 2010
@@ -121,6 +121,15 @@ class CassandraStore extends Store with 
 
   protected def _stop(onCompleted: Runnable) = {
     blocking.shutdown
+    new Thread("casandra client shutdown") {
+      override def run = {
+        while( !blocking.awaitTermination(5, TimeUnit.SECONDS) ) {
+          warn("cassandra thread pool is taking a long time to shutdown.")
+        }
+        client.stop
+        onCompleted.run
+      }
+    }.start
   }
 
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala?rev=961135&r1=961134&r2=961135&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/scala/org/apache/activemq/broker/store/hawtdb/HawtDBClient.scala
Wed Jul  7 04:08:48 2010
@@ -386,10 +386,7 @@ class HawtDBClient(hawtDBStore: HawtDBSt
     val buffer = baos.toBuffer()
     append(buffer) {
       location =>
-        executeStore(batch, update, null, location)
-    }
-    if(onComplete!=null) {
-      onComplete.run
+        executeStore(batch, update, onComplete, location)
     }
   }
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java?rev=961135&r1=961134&r2=961135&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportFactory.java
Wed Jul  7 04:08:48 2010
@@ -46,7 +46,6 @@ public class PipeTransportFactory implem
             PipeTransportServer server = new PipeTransportServer();
             server.setConnectURI(uri);
             server.setName(node);
-            server.setWireFormatFactory(TransportFactorySupport.createWireFormatFactory(options));
             IntrospectionSupport.setProperties(server, options);
 
             if (!options.isEmpty()) {

Modified: activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml?rev=961135&r1=961134&r2=961135&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-web/pom.xml Wed Jul  7 04:08:48 2010
@@ -63,6 +63,11 @@
       <artifactId>jackson-xc</artifactId>
       <version>${jackson-version}</version>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback-version}</version>
+    </dependency>
 
     <!-- Scala Support -->
     <dependency>

Modified: activemq/sandbox/activemq-apollo-actor/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961135&r1=961134&r2=961135&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul  7 04:08:48 2010
@@ -98,6 +98,7 @@
     <scalate-version>1.2-SNAPSHOT</scalate-version>
     <servlet-api-version>2.5</servlet-api-version>
     <jackson-version>1.5.2</jackson-version>
+    <logback-version>0.9.18</logback-version>
     
     <scala-version>2.8.0.RC3</scala-version>
     <scalatest-version>1.2-for-scala-2.8.0.RC3-SNAPSHOT</scalatest-version>



Mime
View raw message