activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961062 [7/14] - in /activemq/sandbox/activemq-apollo-actor: ./ activemq-all/ activemq-all/src/test/ide-resources/ activemq-all/src/test/java/org/apache/activemq/jaxb/ activemq-all/src/test/java/org/apache/activemq/legacy/ activemq-all/src/...
Date Wed, 07 Jul 2010 03:24:44 GMT
Added: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportServer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportServer.java?rev=961062&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportServer.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransportServer.java Wed Jul  7 03:24:02 2010
@@ -0,0 +1,147 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.pipe;
+
+import org.apache.activemq.transport.TransportAcceptListener;
+import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.wireformat.WireFormatFactory;
+import org.fusesource.hawtdispatch.CustomDispatchSource;
+import org.fusesource.hawtdispatch.Dispatch;
+import org.fusesource.hawtdispatch.DispatchQueue;
+import org.fusesource.hawtdispatch.EventAggregators;
+
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.LinkedList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class PipeTransportServer implements TransportServer {
+
+    protected URI connectURI;
+    protected TransportAcceptListener listener;
+    protected String name;
+    protected WireFormatFactory wireFormatFactory;
+    protected boolean marshal;
+    protected final AtomicInteger connectionCounter = new AtomicInteger();
+    DispatchQueue dispatchQueue;
+
+    private CustomDispatchSource<PipeTransport,LinkedList<PipeTransport>> acceptSource;
+
+
+    public URI getConnectURI() {
+        return connectURI;
+    }
+
+    public InetSocketAddress getSocketAddress() {
+        return null;
+    }
+
+    public DispatchQueue getDispatchQueue() {
+        return dispatchQueue;
+    }
+
+    public void setDispatchQueue(DispatchQueue queue) {
+        dispatchQueue = queue;
+    }
+
+    public void suspend() {
+        acceptSource.suspend();
+    }
+
+    public void resume() {
+        acceptSource.resume();
+    }
+
+    public void setAcceptListener(TransportAcceptListener listener) {
+        this.listener = listener;
+    }
+
+    public void start() throws Exception {
+        acceptSource = Dispatch.createSource(EventAggregators.<PipeTransport>linkedList(), dispatchQueue);
+        acceptSource.setEventHandler(new Runnable() {
+            public void run() {
+                LinkedList<PipeTransport> transports = acceptSource.getData();
+                for (PipeTransport transport : transports) {
+                    listener.onAccept(transport);
+                }
+            }
+        });
+    }
+
+    public void stop() throws Exception {
+        acceptSource.release();
+        PipeTransportFactory.unbind(this);
+    }
+
+    public void setConnectURI(URI connectURI) {
+        this.connectURI = connectURI;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public PipeTransport connect() {
+        int connectionId = connectionCounter.incrementAndGet();
+        String remoteAddress = connectURI.toString() + "#" + connectionId;
+        assert this.listener != null : "Server does not have an accept listener";
+
+        PipeTransport clientTransport = createClientTransport();
+        PipeTransport serverTransport = createServerTransport();
+        clientTransport.peer = serverTransport;
+        serverTransport.peer = clientTransport;
+
+        clientTransport.setRemoteAddress(remoteAddress);
+        serverTransport.setRemoteAddress(remoteAddress);
+
+        serverTransport.setMarshal(marshal);
+        if (wireFormatFactory != null) {
+            clientTransport.setWireformat(wireFormatFactory.createWireFormat());
+            serverTransport.setWireformat(wireFormatFactory.createWireFormat());
+        }
+        this.acceptSource.merge(serverTransport);
+        return clientTransport;
+    }
+
+    protected PipeTransport createClientTransport() {
+        return new PipeTransport(this);
+    }
+    
+    protected PipeTransport createServerTransport() {
+        return new PipeTransport(this);
+    }
+
+    public void setWireFormatFactory(WireFormatFactory wireFormatFactory) {
+        this.wireFormatFactory = wireFormatFactory;
+    }
+
+    public boolean isMarshal() {
+        return marshal;
+    }
+
+    public void setMarshal(boolean marshal) {
+        this.marshal = marshal;
+    }
+}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java?rev=961062&r1=961061&r2=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java Wed Jul  7 03:24:02 2010
@@ -22,6 +22,7 @@ import java.io.DataOutput;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.channels.ReadableByteChannel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -55,14 +56,6 @@ public class MultiWireFormatFactory impl
             return 0;
         }
 
-        public boolean inReceive() {
-            return wireFormat.inReceive();
-        }
-
-        public void setVersion(int version) {
-            wireFormat.setVersion(version);
-        }
-
         private ByteArrayInputStream peeked;
 
         public Object unmarshal(DataInput in) throws IOException {
@@ -107,6 +100,10 @@ public class MultiWireFormatFactory impl
             return rc;
         }
 
+        public Object unmarshal(ReadableByteChannel channel) {
+            throw new UnsupportedOperationException();
+        }
+
         public void marshal(Object command, DataOutput out) throws IOException {
             wireFormat.marshal(command, out);
         }
@@ -131,14 +128,6 @@ public class MultiWireFormatFactory impl
             }
         }
 
-        public Transport createTransportFilters(Transport transport, Map options) {
-        	if( wireFormat==null ) {
-        		return transport;
-        	} else {
-        		return wireFormat.createTransportFilters(transport, options);
-        	}
-        }
-
         public String getName() {
             if (wireFormat == null) {
                 return WIREFORMAT_NAME;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java?rev=961062&r1=961061&r2=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java Wed Jul  7 03:24:02 2010
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
+import java.nio.channels.ReadableByteChannel;
 import java.util.Map;
 
 import org.apache.activemq.transport.Transport;
@@ -71,6 +72,10 @@ public class ObjectStreamWireFormat impl
         }
     }
 
+    public Object unmarshal(ReadableByteChannel channel) {
+        throw new UnsupportedOperationException();
+    }
+
     public void setVersion(int version) {
     }
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java?rev=961062&r1=961061&r2=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java Wed Jul  7 03:24:02 2010
@@ -19,6 +19,8 @@ package org.apache.activemq.wireformat;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.SocketChannel;
 import java.util.Map;
 
 import org.apache.activemq.transport.Transport;
@@ -52,39 +54,18 @@ public interface WireFormat {
      * Packet based un-marshaling 
      */
     Object unmarshal(DataInput in) throws IOException;
-    
-    /**
-     * @param the version of the wire format
-     */
-    void setVersion(int version);
-    
-    /**
-     * @return the version of the wire format
-     */
-    int getVersion();
-    
+
+    Object unmarshal(ReadableByteChannel channel);
+
     /**
      * @return The name of the wireformat
      */
     String getName();
     
     /**
-     * @return true if message is being received
-     */
-    boolean inReceive();
-    
-    /**
-     * Creates any transport filters appropriate for the given wire format:
-     * 
-     * @param transport The transport to filter.
-     * @param options The options with which the transport was created. 
-     * @return Either the given transport or a Transport filter wrapping the onw provided. 
-     */
-    Transport createTransportFilters(Transport transport, Map options);
-
-    /**
      * Returns a WireFormatFactory which can create WireFormat of this type.
      * @return
      */
     WireFormatFactory getWireFormatFactory();
+
 }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java?rev=961062&r1=961061&r2=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java Wed Jul  7 03:24:02 2010
@@ -3,6 +3,7 @@ package org.apache.activemq.wireformat.m
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.nio.channels.ReadableByteChannel;
 import java.util.Map;
 
 import org.apache.activemq.transport.Transport;
@@ -48,7 +49,11 @@ public class MockWireFormatFactory imple
 	        throw new UnsupportedOperationException();
 		}
 
-		public WireFormatFactory getWireFormatFactory() {
+        public Object unmarshal(ReadableByteChannel channel) {
+            throw new UnsupportedOperationException();
+        }
+
+        public WireFormatFactory getWireFormatFactory() {
 			return new MockWireFormatFactory();
 		}
     }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/Buffer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/Buffer.java?rev=961062&r1=961061&r2=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/Buffer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/Buffer.java Wed Jul  7 03:24:02 2010
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.util.buffer;
 
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -367,6 +368,9 @@ public class Buffer implements Comparabl
 
         return new Buffer(data, 0, size);
     }
-    
 
+
+    public ByteBuffer toByteBuffer() {
+        return ByteBuffer.wrap(data, offset, length);
+    }
 }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/ByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/ByteArrayOutputStream.java?rev=961062&r1=961061&r2=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/ByteArrayOutputStream.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/ByteArrayOutputStream.java Wed Jul  7 03:24:02 2010
@@ -50,10 +50,14 @@ public class ByteArrayOutputStream exten
         System.arraycopy(b, off, buffer, size, len);
         size = newsize;
     }
-    
+
+    public void write(Buffer b) {
+        write(b.data, b.offset, b.length);
+    }
+
     /**
      * Ensures the the buffer has at least the minimumCapacity specified. 
-     * @param i
+     * @param minimumCapacity
      */
     private void checkCapacity(int minimumCapacity) {
         if (minimumCapacity > buffer.length) {

Modified: activemq/sandbox/activemq-apollo-actor/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961062&r1=961061&r2=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul  7 03:24:02 2010
@@ -87,6 +87,14 @@
     <xstream-version>1.3.1</xstream-version>
     <xbean-version>3.4</xbean-version>
     <felix-version>1.0.0</felix-version>
+    
+    <hawtdispatch-version>1.0-SNAPSHOT</hawtdispatch-version>
+    <hawtdb-version>1.1-SNAPSHOT</hawtdb-version>
+
+    <scala-version>2.8.0.Beta1</scala-version>
+    <scalatest-version>1.0.1-for-scala-2.8.0.Beta1-RC7-with-test-interfaces-0.3-SNAPSHOT</scalatest-version>
+    <scala-plugin-version>2.9.1</scala-plugin-version>
+    
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
   </properties>
 
@@ -119,27 +127,14 @@
     <module>activemq-bio</module>
     <module>activemq-broker</module>
     <module>activemq-jaxb</module>
-    <module>activemq-dispatcher</module>
-    <module>activemq-flow</module>
     <module>activemq-kaha</module>
-    <module>activemq-openwire</module>
     <module>activemq-stomp</module>
     <module>activemq-store</module>
+    <module>activemq-scala</module>
     <module>activemq-transport</module>
     <module>activemq-util</module>
-    <module>hawtdb</module>
-    <module>kahadb</module>
     <module>activemq-protobuf</module>
-    <module>activemq-client</module>
-    <module>activemq-network</module>
-    <module>activemq-all</module>
     <module>activemq-selector</module>
-    <module>activemq-queue</module>
-    <module>activemq-jmx</module>
-    <module>activemq-spring</module>
-    <!-- Speed up the build for now
-      <module>distribution</module>
-    -->
   </modules>
 
   <scm>
@@ -148,6 +143,21 @@
     <url>http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/</url>
   </scm>
 
+  <!-- for the hawtdispatch dep -->
+  <repositories>
+     <repository>
+       <id>fusesource.snapshots</id>
+       <name>FuseSource Snapshot Repository</name>
+       <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
+       <snapshots>
+         <enabled>true</enabled>
+       </snapshots>
+       <releases>
+         <enabled>false</enabled>
+       </releases>
+     </repository>
+   </repositories>
+
   <!-- This is only here since the activemq-protobuf plugin has not been released yet -->
   <pluginRepositories>
     <pluginRepository>
@@ -356,32 +366,32 @@
       <!-- Optional dependencies -->
       <!-- =============================== -->
 
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-core</artifactId>
-        <version>${camel-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spring</artifactId>
-        <version>${camel-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-jetty</artifactId>
-        <version>${camel-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-jms</artifactId>
-        <version>${camel-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-web</artifactId>
-        <version>${camel-version}</version>
-        <type>war</type>
-      </dependency>
+      <!--<dependency>-->
+        <!--<groupId>org.apache.camel</groupId>-->
+        <!--<artifactId>camel-core</artifactId>-->
+        <!--<version>${camel-version}</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.camel</groupId>-->
+        <!--<artifactId>camel-spring</artifactId>-->
+        <!--<version>${camel-version}</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.camel</groupId>-->
+        <!--<artifactId>camel-jetty</artifactId>-->
+        <!--<version>${camel-version}</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.camel</groupId>-->
+        <!--<artifactId>camel-jms</artifactId>-->
+        <!--<version>${camel-version}</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.camel</groupId>-->
+        <!--<artifactId>camel-web</artifactId>-->
+        <!--<version>${camel-version}</version>-->
+        <!--<type>war</type>-->
+      <!--</dependency>-->
 
       <dependency>
         <groupId>org.apache.hadoop.zookeeper</groupId>
@@ -420,20 +430,20 @@
       </dependency>
 
       <!-- camel testing -->
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-core</artifactId>
-        <version>${camel-version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spring</artifactId>
-        <version>${camel-version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
+      <!--<dependency>-->
+        <!--<groupId>org.apache.camel</groupId>-->
+        <!--<artifactId>camel-core</artifactId>-->
+        <!--<version>${camel-version}</version>-->
+        <!--<type>test-jar</type>-->
+        <!--<scope>test</scope>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.camel</groupId>-->
+        <!--<artifactId>camel-spring</artifactId>-->
+        <!--<version>${camel-version}</version>-->
+        <!--<type>test-jar</type>-->
+        <!--<scope>test</scope>-->
+      <!--</dependency>-->
 
 
       <!--  for custom XML parsing -->
@@ -584,19 +594,19 @@
       </dependency>
 
       <!-- Optional Jabber support -->
-      <dependency>
-        <groupId>activemq</groupId>
-        <artifactId>smack</artifactId>
-        <version>1.5.0</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>activemq</groupId>
-        <artifactId>smackx</artifactId>
-        <version>1.5.0</version>
-        <optional>true</optional>
-      </dependency>
+      <!--<dependency>-->
+        <!--<groupId>activemq</groupId>-->
+        <!--<artifactId>smack</artifactId>-->
+        <!--<version>1.5.0</version>-->
+        <!--<optional>true</optional>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>activemq</groupId>-->
+        <!--<artifactId>smackx</artifactId>-->
+        <!--<version>1.5.0</version>-->
+        <!--<optional>true</optional>-->
+      <!--</dependency>-->
 
       <!-- =============================== -->
       <!-- XML processing dependencies -->
@@ -755,16 +765,16 @@
         <version>${jdom-version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>p2psockets</groupId>
-        <artifactId>p2psockets-core</artifactId>
-        <version>${p2psockets-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>jxta</groupId>
-        <artifactId>jxta</artifactId>
-        <version>${jxta-version}</version>
-      </dependency>
+      <!--<dependency>-->
+        <!--<groupId>p2psockets</groupId>-->
+        <!--<artifactId>p2psockets-core</artifactId>-->
+        <!--<version>${p2psockets-version}</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>jxta</groupId>-->
+        <!--<artifactId>jxta</artifactId>-->
+        <!--<version>${jxta-version}</version>-->
+      <!--</dependency>-->
 
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -804,18 +814,18 @@
       </dependency>
 
 
-      <dependency>
-        <groupId>org.apache.servicemix.kernel</groupId>
-        <artifactId>apache-servicemix-kernel</artifactId>
-        <version>${servicemix.kernel.version}</version>
-        <type>zip</type>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.servicemix.kernel</groupId>
-        <artifactId>apache-servicemix-kernel</artifactId>
-        <version>${servicemix.kernel.version}</version>
-        <type>tar.gz</type>
-      </dependency>
+      <!--<dependency>-->
+        <!--<groupId>org.apache.servicemix.kernel</groupId>-->
+        <!--<artifactId>apache-servicemix-kernel</artifactId>-->
+        <!--<version>${servicemix.kernel.version}</version>-->
+        <!--<type>zip</type>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.servicemix.kernel</groupId>-->
+        <!--<artifactId>apache-servicemix-kernel</artifactId>-->
+        <!--<version>${servicemix.kernel.version}</version>-->
+        <!--<type>tar.gz</type>-->
+      <!--</dependency>-->
 
     </dependencies>
   </dependencyManagement>
@@ -987,23 +997,23 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>${felix-version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${artifactId}</Bundle-Name>
-            <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
-            <Export-Package>${activemq.osgi.export}</Export-Package>
-            <Import-Package>${activemq.osgi.import}</Import-Package>
-            <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
-            <Implementation-Title>Apache ActiveMQ</Implementation-Title>
-            <Implementation-Version>${project.version}</Implementation-Version>
-          </instructions>
-        </configuration>
-      </plugin>
+      <!--<plugin>-->
+        <!--<groupId>org.apache.felix</groupId>-->
+        <!--<artifactId>maven-bundle-plugin</artifactId>-->
+        <!--<version>${felix-version}</version>-->
+        <!--<extensions>true</extensions>-->
+        <!--<configuration>-->
+          <!--<instructions>-->
+            <!--<Bundle-Name>${artifactId}</Bundle-Name>-->
+            <!--<Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>-->
+            <!--<Export-Package>${activemq.osgi.export}</Export-Package>-->
+            <!--<Import-Package>${activemq.osgi.import}</Import-Package>-->
+            <!--<Private-Package>${activemq.osgi.private.pkg}</Private-Package>-->
+            <!--<Implementation-Title>Apache ActiveMQ</Implementation-Title>-->
+            <!--<Implementation-Version>${project.version}</Implementation-Version>-->
+          <!--</instructions>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
     </plugins>
   </build>
   <reporting>

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/pom.xml&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/ide-resources/log4j.properties (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/ide-resources/log4j.properties)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/ide-resources/log4j.properties?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/ide-resources/log4j.properties&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/ide-resources/log4j.properties&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQMessageAuditTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQMessageAuditTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQMessageAuditTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQMessageAuditTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQMessageAuditTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageTransformationTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/MessageTransformationTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageTransformationTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageTransformationTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/MessageTransformationTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/QueueConsumerPriorityTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/QueueConsumerPriorityTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/QueueConsumerPriorityTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/QueueConsumerPriorityTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/QueueConsumerPriorityTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/RemoveDestinationTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/RemoveDestinationTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/RemoveDestinationTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/RemoveDestinationTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/RemoveDestinationTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/TimeStampTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/TimeStampTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/TimeStampTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/TimeStampTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/TimeStampTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/blob/BlobTransferPolicyUriTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/blob/BlobTransferPolicyUriTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/blob/BlobTransferPolicyUriTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/blob/BlobTransferPolicyUriTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/blob/BlobTransferPolicyUriTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/blob/DefaultBlobUploadStrategyTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/blob/DefaultBlobUploadStrategyTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/blob/DefaultBlobUploadStrategyTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/blob/DefaultBlobUploadStrategyTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/blob/DefaultBlobUploadStrategyTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1917Test.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1917Test.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1917Test.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1917Test.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1917Test.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1936Test.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1936Test.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1936Test.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1936Test.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1936Test.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/CraigsBugTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MessageSender.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MessageSender.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MessageSender.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MessageSender.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MessageSender.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackSharedConsumerTests.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackSharedConsumerTests.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackSharedConsumerTests.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackSharedConsumerTests.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackSharedConsumerTests.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackTests.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackTests.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackTests.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackTests.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/RawRollbackTests.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/Receiver.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/Receiver.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/Receiver.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/Receiver.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/Receiver.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/ActiveMQTestCase.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/ActiveMQTestCase.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/ActiveMQTestCase.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/ActiveMQTestCase.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/ActiveMQTestCase.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/MessageSelectorTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/MessageSelectorTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/MessageSelectorTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/MessageSelectorTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/amq1095/MessageSelectorTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/CreateDestinationsOnStartupViaXBeanTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerAndConnectionTestSupport.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/EmbeddedBrokerTestSupport.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithJMXEnabledTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test5/ClientTestSupport.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/QueueClusterTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/QueueClusterTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/QueueClusterTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/QueueClusterTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/QueueClusterTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransport.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransport.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransport.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransport.java Wed Jul  7 03:24:02 2010
@@ -20,14 +20,14 @@ import java.io.IOException;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.activemq.transport.TransportSupport;
+import org.apache.activemq.transport.BaseTransport;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.wireformat.WireFormat;
 
 /**
  * 
  */
-public class StubTransport extends TransportSupport {
+public class StubTransport extends BaseTransport {
 
     private Queue<Object> queue = new ConcurrentLinkedQueue<Object>();
 

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransportListener.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransportListener.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransportListener.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransportListener.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransportListener.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransportListener.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/StubTransportListener.java Wed Jul  7 03:24:02 2010
@@ -46,10 +46,10 @@ public class StubTransportListener imple
         exceptions.add(error);
     }
 
-    public void transportInterupted() {
+    public void onDisconnected() {
     }
 
-    public void transportResumed() {
+    public void onConnected() {
     }
 
 }

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TransportBrokerTestSupport.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/AMQ1925Test.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/AMQ1925Test.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/AMQ1925Test.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/AMQ1925Test.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/AMQ1925Test.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java Wed Jul  7 03:24:02 2010
@@ -59,10 +59,10 @@ public class BadConnectionTest extends T
             public void onException(IOException error) {
             }
 
-            public void transportInterupted() {
+            public void onDisconnected() {
             }
 
-            public void transportResumed() {
+            public void onConnected() {
             }
         });
         transport.start();

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverRandomTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverRandomTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverRandomTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverRandomTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverRandomTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverTimeoutTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverTimeoutTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverTimeoutTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverTimeoutTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverTimeoutTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverUriTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverUriTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverUriTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverUriTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/FailoverUriTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java Wed Jul  7 03:24:02 2010
@@ -82,12 +82,12 @@ public class ReconnectTest extends TestC
                     setError(error);
                 }
 
-                public void transportInterupted() {
+                public void onDisconnected() {
                     LOG.info("Worker "+name+" was interrupted...");
                     interruptedCount.incrementAndGet();
                 }
 
-                public void transportResumed() {
+                public void onConnected() {
                     LOG.info("Worker "+name+" was resummed...");
                     resumedCount.incrementAndGet();
                 }

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/SlowConnectionTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/SlowConnectionTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/SlowConnectionTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/SlowConnectionTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/SlowConnectionTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsDurableTopicSendReceiveTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOJmsSendAndReceiveTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOPersistentSendAndReceiveTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOPersistentSendAndReceiveTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOPersistentSendAndReceiveTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOPersistentSendAndReceiveTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOPersistentSendAndReceiveTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/nio/NIOTransportBrokerTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java Wed Jul  7 03:24:02 2010
@@ -81,10 +81,10 @@ public class InactivityMonitorTest exten
                 }
             }
 
-            public void transportInterupted() {
+            public void onDisconnected() {
             }
 
-            public void transportResumed() {
+            public void onConnected() {
             }
         });
         clientTransport.start();
@@ -139,10 +139,10 @@ public class InactivityMonitorTest exten
                     }
                 }
 
-                public void transportInterupted() {
+                public void onDisconnected() {
                 }
 
-                public void transportResumed() {
+                public void onConnected() {
                 }
             });
             serverTransport.start();
@@ -178,10 +178,10 @@ public class InactivityMonitorTest exten
                 }
             }
 
-            public void transportInterupted() {
+            public void onDisconnected() {
             }
 
-            public void transportResumed() {
+            public void onConnected() {
             }
         });
         clientTransport.start();

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslBrokerServiceTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextBrokerServiceTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextBrokerServiceTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextBrokerServiceTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextBrokerServiceTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextBrokerServiceTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)

Copied: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java (from r946684, activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java?p2=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java&r1=946684&r2=961062&rev=961062&view=diff
==============================================================================
    (empty)



Mime
View raw message