You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/07/07 05:41:33 UTC
svn commit: r961069 [1/2] - in /activemq/sandbox/activemq-apollo-actor: ./
activemq-broker/
activemq-broker/src/main/java/org/apache/activemq/apollo/broker/
activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/
activemq-broker/src/test/scal...
Author: chirino
Date: Wed Jul 7 03:41:30 2010
New Revision: 961069
URL: http://svn.apache.org/viewvc?rev=961069&view=rev
Log:
pom tweaks
Added:
activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/ide-resources/log4j.properties
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/ide-resources/log4j.properties
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/resources/log4j.properties
- copied, changed from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/resources/log4j.properties
Removed:
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/ide-resources/log4j.properties
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/resources/log4j.properties
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ScalaBroker.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/BrokerTest.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/SharedQueueTest.java
activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-jaxb/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-selector/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-store/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-tcp/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/pom.xml
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/FutureResponse.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/Transport.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFilter.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportListener.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportServer.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryEvent.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java (contents, props changed)
activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml
activemq/sandbox/activemq-apollo-actor/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-network/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-spring/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/distribution/pom.xml
activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml (contents, props changed)
activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/pom.xml (contents, props changed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -34,6 +34,28 @@
<dependencies>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-transport</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-store</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-selector</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kaha</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </dependency>
+
+
+ <dependency>
<groupId>org.fusesource.hawtdispatch</groupId>
<artifactId>hawtdispatch-scala</artifactId>
<version>${hawtdispatch-version}</version>
@@ -53,28 +75,12 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-transport</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-store</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-selector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kaha</artifactId>
- </dependency>
-
+
<!-- Testing Dependencies -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-transport</artifactId>
+ <version>6.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -82,11 +88,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.scala?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.scala Wed Jul 7 03:41:30 2010
@@ -35,13 +35,13 @@ object Domain {
import Domain._
class Domain {
- val targets = new PathMap[DeliveryTarget]();
+ val targets = new PathMap[DeliveryConsumer]();
- def bind(name:AsciiBuffer, queue:DeliveryTarget) = {
+ def bind(name:AsciiBuffer, queue:DeliveryConsumer) = {
targets.put(name, queue);
}
- def unbind(name:AsciiBuffer, queue:DeliveryTarget) = {
+ def unbind(name:AsciiBuffer, queue:DeliveryConsumer) = {
targets.remove(name, queue);
}
@@ -68,11 +68,11 @@ class Domain {
class Router(var queue:DispatchQueue) {
trait DestinationNode {
- var targets = List[DeliveryTarget]()
+ var targets = List[DeliveryConsumer]()
var routes = List[DeliveryProducerRoute]()
- def on_bind(x:List[DeliveryTarget]):Unit
- def on_unbind(x:List[DeliveryTarget]):Boolean
+ def on_bind(x:List[DeliveryConsumer]):Unit
+ def on_unbind(x:List[DeliveryConsumer]):Boolean
def on_connect(route:DeliveryProducerRoute):Unit
def on_disconnect(route:DeliveryProducerRoute):Boolean = {
routes = routes.filterNot({r=> route==r})
@@ -82,14 +82,14 @@ class Router(var queue:DispatchQueue) {
}
class TopicDestinationNode extends DestinationNode {
- def on_bind(x:List[DeliveryTarget]) = {
+ def on_bind(x:List[DeliveryConsumer]) = {
targets = x ::: targets
routes.foreach({r=>
r.bind(x)
})
}
- def on_unbind(x:List[DeliveryTarget]):Boolean = {
+ def on_unbind(x:List[DeliveryConsumer]):Boolean = {
targets = targets.filterNot({t=>x.contains(t)})
routes.foreach({r=>
r.unbind(x)
@@ -106,12 +106,12 @@ class Router(var queue:DispatchQueue) {
class QueueDestinationNode(destination:Destination) extends DestinationNode {
val queue = new Queue(destination)
- def on_bind(x:List[DeliveryTarget]) = {
+ def on_bind(x:List[DeliveryConsumer]) = {
targets = x ::: targets
queue.bind(x)
}
- def on_unbind(x:List[DeliveryTarget]):Boolean = {
+ def on_unbind(x:List[DeliveryConsumer]):Boolean = {
targets = targets.filterNot({t=>x.contains(t)})
queue.unbind(x)
routes == Nil && targets == Nil
@@ -138,11 +138,11 @@ class Router(var queue:DispatchQueue) {
result
}
- def bind(destination:Destination, targets:List[DeliveryTarget]) = retaining(targets) {
+ def bind(destination:Destination, targets:List[DeliveryConsumer]) = retaining(targets) {
get(destination).on_bind(targets)
} ->: queue
- def unbind(destination:Destination, targets:List[DeliveryTarget]) = releasing(targets) {
+ def unbind(destination:Destination, targets:List[DeliveryConsumer]) = releasing(targets) {
if( get(destination).on_unbind(targets) ) {
destinations.remove(destination)
}
@@ -182,9 +182,9 @@ trait Route extends Retained {
val queue:DispatchQueue
val metric = new AtomicLong();
- def connected(targets:List[DeliveryTarget]):Unit
- def bind(targets:List[DeliveryTarget]):Unit
- def unbind(targets:List[DeliveryTarget]):Unit
+ def connected(targets:List[DeliveryConsumer]):Unit
+ def bind(targets:List[DeliveryConsumer]):Unit
+ def unbind(targets:List[DeliveryConsumer]):Unit
def disconnected():Unit
}
@@ -198,24 +198,24 @@ class DeliveryProducerRoute(val destinat
queue.release
})
- var targets = List[DeliveryTargetSession]()
+ var targets = List[DeliverySession]()
- def connected(targets:List[DeliveryTarget]) = retaining(targets) {
+ def connected(targets:List[DeliveryConsumer]) = retaining(targets) {
internal_bind(targets)
on_connected
} ->: queue
- def bind(targets:List[DeliveryTarget]) = retaining(targets) {
+ def bind(targets:List[DeliveryConsumer]) = retaining(targets) {
internal_bind(targets)
} ->: queue
- private def internal_bind(values:List[DeliveryTarget]) = {
+ private def internal_bind(values:List[DeliveryConsumer]) = {
values.foreach{ x=>
targets = x.open_session(queue) :: targets
}
}
- def unbind(targets:List[DeliveryTarget]) = releasing(targets) {
+ def unbind(targets:List[DeliveryConsumer]) = releasing(targets) {
this.targets = this.targets.filterNot { x=>
val rc = targets.contains(x.consumer)
if( rc ) {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala Wed Jul 7 03:41:30 2010
@@ -27,15 +27,16 @@ trait DeliveryProducer {
def collocate(queue:DispatchQueue):Unit
}
-trait DeliveryTargetSession {
- val consumer:DeliveryTarget
- def deliver(delivery:MessageDelivery)
+trait DeliverySession {
+ val consumer:DeliveryConsumer
+ def deliver(delivery:Delivery)
def close:Unit
}
-trait DeliveryTarget extends Retained {
- def matches(message:MessageDelivery)
+
+trait DeliveryConsumer extends Retained {
+ def matches(message:Delivery)
val queue:DispatchQueue;
- def open_session(producer_queue:DispatchQueue):DeliveryTargetSession
+ def open_session(producer_queue:DispatchQueue):DeliverySession
}
/**
@@ -82,11 +83,11 @@ trait Message {
}
-object MessageDelivery {
- def apply(o:MessageDelivery) = new MessageDelivery(o.message, o.encoded, o.encoding, o.size, o.ack, o.tx_id, o.store_id)
+object Delivery {
+ def apply(o:Delivery) = new Delivery(o.message, o.encoded, o.encoding, o.size, o.ack, o.tx_id, o.store_id)
}
-case class MessageDelivery (
+case class Delivery (
/**
* the message being delivered
@@ -389,7 +390,7 @@ case class MessageDelivery (
*/
class DeliveryBuffer(var maxSize:Int=1024*32) {
- var deliveries = new LinkedList[MessageDelivery]()
+ var deliveries = new LinkedList[Delivery]()
private var size = 0
var eventHandler: Runnable = null
@@ -401,7 +402,7 @@ class DeliveryBuffer(var maxSize:Int=102
def isEmpty = deliveries.isEmpty
- def send(delivery:MessageDelivery):Unit = {
+ def send(delivery:Delivery):Unit = {
delivery.retain
size += delivery.size
deliveries.addLast(delivery)
@@ -410,7 +411,7 @@ class DeliveryBuffer(var maxSize:Int=102
}
}
- def ack(delivery:MessageDelivery) = {
+ def ack(delivery:Delivery) = {
// When a message is delivered to the consumer, we release
// used capacity in the outbound queue, and can drain the inbound
// queue
@@ -426,7 +427,7 @@ class DeliveryBuffer(var maxSize:Int=102
class DeliveryOverflowBuffer(val delivery_buffer:DeliveryBuffer) {
- private var overflow = new LinkedList[MessageDelivery]()
+ private var overflow = new LinkedList[Delivery]()
protected def drainOverflow:Unit = {
while( !overflow.isEmpty && !full ) {
@@ -436,7 +437,7 @@ class DeliveryOverflowBuffer(val deliver
}
}
- def send(delivery:MessageDelivery) = {
+ def send(delivery:Delivery) = {
if( full ) {
// Deliveries in the overflow queue is remain acquired by us so that
// producer that sent it to us gets flow controlled.
@@ -447,8 +448,8 @@ class DeliveryOverflowBuffer(val deliver
}
}
- protected def send_to_delivery_queue(value:MessageDelivery) = {
- var delivery = MessageDelivery(value)
+ protected def send_to_delivery_queue(value:Delivery) = {
+ var delivery = Delivery(value)
delivery.setDisposer(^{
drainOverflow
})
@@ -475,7 +476,7 @@ class DeliveryCreditBufferProtocol(val d
})
// use a event aggregating source to coalesce multiple events from the same thread.
- val source = createSource(new ListEventAggregator[MessageDelivery](), queue)
+ val source = createSource(new ListEventAggregator[Delivery](), queue)
source.setEventHandler(^{drain_source});
source.resume
@@ -524,8 +525,8 @@ class DeliveryCreditBufferProtocol(val d
override def full = credits <= 0
- override protected def send_to_delivery_queue(value:MessageDelivery) = {
- var delivery = MessageDelivery(value)
+ override protected def send_to_delivery_queue(value:Delivery) = {
+ var delivery = Delivery(value)
delivery.setDisposer(^{
// This is called from the server/consumer thread
credit_adder.merge(delivery.size);
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ScalaBroker.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ScalaBroker.scala?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ScalaBroker.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ScalaBroker.scala Wed Jul 7 03:41:30 2010
@@ -337,7 +337,7 @@ object Queue {
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
-class Queue(val destination:Destination) extends BaseRetained with Route with DeliveryTarget with DeliveryProducer {
+class Queue(val destination:Destination) extends BaseRetained with Route with DeliveryConsumer with DeliveryProducer {
@@ -350,11 +350,11 @@ class Queue(val destination:Destination)
val delivery_buffer = new DeliveryBuffer
- class ConsumerState(val consumer:DeliveryTargetSession) {
+ class ConsumerState(val consumer:DeliverySession) {
var bound=true
- def deliver(value:MessageDelivery):Unit = {
- val delivery = MessageDelivery(value)
+ def deliver(value:Delivery):Unit = {
+ val delivery = Delivery(value)
delivery.setDisposer(^{
^{ completed(value) } ->:queue
})
@@ -362,7 +362,7 @@ class Queue(val destination:Destination)
delivery.release
}
- def completed(delivery:MessageDelivery) = {
+ def completed(delivery:Delivery) = {
// Lets get back on the readyList if we are still bound.
if( bound ) {
readyConsumers.addLast(this)
@@ -371,11 +371,11 @@ class Queue(val destination:Destination)
}
}
- var allConsumers = Map[DeliveryTarget,ConsumerState]()
+ var allConsumers = Map[DeliveryConsumer,ConsumerState]()
val readyConsumers = new LinkedList[ConsumerState]()
- def connected(consumers:List[DeliveryTarget]) = bind(consumers)
- def bind(consumers:List[DeliveryTarget]) = retaining(consumers) {
+ def connected(consumers:List[DeliveryConsumer]) = bind(consumers)
+ def bind(consumers:List[DeliveryConsumer]) = retaining(consumers) {
for ( consumer <- consumers ) {
val cs = new ConsumerState(consumer.open_session(queue))
allConsumers += consumer->cs
@@ -384,7 +384,7 @@ class Queue(val destination:Destination)
delivery_buffer.eventHandler.run
} ->: queue
- def unbind(consumers:List[DeliveryTarget]) = releasing(consumers) {
+ def unbind(consumers:List[DeliveryConsumer]) = releasing(consumers) {
for ( consumer <- consumers ) {
allConsumers.get(consumer) match {
case Some(cs)=>
@@ -417,19 +417,19 @@ class Queue(val destination:Destination)
val deliveryQueue = new DeliveryCreditBufferProtocol(delivery_buffer, queue)
- def open_session(producer_queue:DispatchQueue) = new DeliveryTargetSession {
+ def open_session(producer_queue:DispatchQueue) = new DeliverySession {
val session = deliveryQueue.session(producer_queue)
val consumer = Queue.this
retain
- def deliver(delivery:MessageDelivery) = session.send(delivery)
+ def deliver(delivery:Delivery) = session.send(delivery)
def close = {
session.close
release
}
}
- def matches(message:MessageDelivery) = { true }
+ def matches(message:Delivery) = { true }
// def open_session(producer_queue:DispatchQueue) = new ConsumerSession {
// val consumer = StompQueue.this
@@ -560,8 +560,8 @@ class XQueue(val destination:Destination
// }
// TODO:
- def matches(message:MessageDelivery) = false
- def deliver(message:MessageDelivery) = {
+ def matches(message:Delivery) = false
+ def deliver(message:Delivery) = {
// TODO:
}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Subscription.scala Wed Jul 7 03:41:30 2010
@@ -113,8 +113,8 @@ class WildcardQueueSubscription(val host
}
class TopicSubscription { // extends BrokerSubscription with DeliveryTarget {
- def matches(message:MessageDelivery) = false
- def deliver(message:MessageDelivery) = {}
+ def matches(message:Delivery) = false
+ def deliver(message:Delivery) = {}
def connect(consumer:ConsumerContext) = {}
def disconnect(consumer:ConsumerContext) = {}
def getDestination():Destination = null
@@ -262,7 +262,7 @@ class DurableSubscription(val host:Virtu
/* (non-Javadoc)
* @see org.apache.activemq.broker.DeliveryTarget#deliver(org.apache.activemq.broker.MessageDelivery, org.apache.activemq.flow.ISourceController)
*/
- def deliver(message:MessageDelivery ) = {
+ def deliver(message:Delivery ) = {
// TODO:
// queue.add(message, source);
}
@@ -285,7 +285,7 @@ class DurableSubscription(val host:Virtu
// }
}
- def matches(message:MessageDelivery) = {
+ def matches(message:Delivery) = {
if (selector != null) {
var selectorContext = message.message.messageEvaluationContext
selectorContext.setDestination(destination);
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/BrokerTest.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/BrokerTest.scala?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/BrokerTest.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/BrokerTest.scala Wed Jul 7 03:41:30 2010
@@ -58,7 +58,7 @@ abstract class RemoteConsumer extends Co
protected def setupSubscription()
- protected def messageReceived( elem:MessageDelivery ) {
+ protected def messageReceived( elem:Delivery ) {
// TODO:
// if( schedualWait ) {
// if (thinkTime > 0) {
@@ -104,7 +104,7 @@ abstract class RemoteProducer extends Co
var destination:Destination =null
var property:String = null
var totalProducerRate:MetricAggregator = null
- var next:MessageDelivery = null
+ var next:Delivery = null
var filler:String = null
var payloadSize = 20
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/SharedQueueTest.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/broker/SharedQueueTest.java Wed Jul 7 03:41:30 2010
@@ -16,19 +16,8 @@
*/
package org.apache.activemq.broker;
-import java.io.File;
-import java.util.ArrayList;
-
import junit.framework.TestCase;
-import org.apache.activemq.apollo.broker.BrokerDatabase;
-import org.apache.activemq.apollo.broker.BrokerQueueStore;
-import org.apache.activemq.apollo.broker.MessageDelivery;
-import org.apache.activemq.broker.store.Store;
-import org.apache.activemq.broker.store.StoreFactory;
-import org.fusesource.hawtdispatch.Dispatch;
-import org.fusesource.hawtdispatch.DispatchQueue;
-
/**
* @author cmacnaug
*
Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -36,6 +36,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-store</artifactId>
+ <version>6.0-SNAPSHOT</version>
<optional>false</optional>
</dependency>
@@ -49,6 +50,7 @@
<dependency>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
+ <version>${activemq-protobuf-version}</version>
<optional>false</optional>
</dependency>
@@ -56,7 +58,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-store</artifactId>
- <version>${activemq-version}</version>
+ <version>6.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -64,13 +66,15 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
-
+
</dependencies>
<build>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -53,10 +53,13 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
+ <version>6.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -70,11 +73,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml Wed Jul 7 03:41:30 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -35,6 +35,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-util</artifactId>
+ <version>6.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -68,14 +69,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit-version}</version>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-scala/pom.xml
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-selector/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-selector/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-selector/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -32,20 +32,24 @@
<name>ActiveMQ :: Selector</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-util</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </dependency>
+
<!-- TODO: try to remove this dependency -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <version>${spring-version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-util</artifactId>
- </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
+ <version>2.6.0</version>
<optional>true</optional>
</dependency>
@@ -54,11 +58,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml (from r961068, activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml&p1=activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,30 +20,28 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
+ <artifactId>activemq-stomp</artifactId>
<packaging>jar</packaging>
<version>6.0-SNAPSHOT</version>
- <name>ActiveMQ :: Broker</name>
+ <name>ActiveMQ :: Stomp</name>
<dependencies>
-
+
<dependency>
- <groupId>org.fusesource.hawtdispatch</groupId>
- <artifactId>hawtdispatch-scala</artifactId>
- <version>${hawtdispatch-version}</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>6.0-SNAPSHOT</version>
</dependency>
-
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <scope>compile</scope>
- <version>${scala-version}</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-tcp</artifactId>
+ <version>6.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -55,78 +53,55 @@
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-transport</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-store</artifactId>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${xstream-version}</version>
</dependency>
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-selector</artifactId>
+ <artifactId>activemq-broker</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kaha</artifactId>
+ <artifactId>activemq-util</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
- <!-- Testing Dependencies -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-transport</artifactId>
- <type>test-jar</type>
+ <artifactId>activemq-jaxb</artifactId>
+ <version>6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
-
+
</dependencies>
<build>
-
+
<defaultGoal>install</defaultGoal>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
- <resources>
- <resource>
- <directory>target/schema</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
-
- <!-- Generate a test jar for the test cases in this package -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
@@ -150,7 +125,7 @@
<scalaVersion>${scala-version}</scalaVersion>
</configuration>
</plugin>
-
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
@@ -166,5 +141,5 @@
</plugins>
</build>
-
+
</project>
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/DefaultFrameTranslator.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/FrameTranslator.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/Stomp.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompConnection.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompFrame.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageDelivery.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompMessageEvaluationContext.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompProtocolHandler.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompSslTransportFactory.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompTransportFactory.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormat.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/StompWireFormatFactory.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/XStreamFrameTranslator.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/java/org/apache/activemq/apollo/stomp/package.html&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/broker/protocol/stomp&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/ide-resources/log4j.properties (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/ide-resources/log4j.properties)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/ide-resources/log4j.properties?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/ide-resources/log4j.properties&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/ide-resources/log4j.properties&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompBrokerTest.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteConsumer.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/java/org/apache/activemq/perf/broker/stomp/StompRemoteProducer.java&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Copied: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/resources/log4j.properties (from r961068, activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/resources/log4j.properties)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/resources/log4j.properties?p2=activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/resources/log4j.properties&p1=activemq/sandbox/activemq-apollo-actor/sandbox/activemq-stomp/src/test/resources/log4j.properties&r1=961068&r2=961069&rev=961069&view=diff
==============================================================================
(empty)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-store/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-store/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -44,11 +44,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-tcp/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-tcp/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -36,17 +36,20 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-transport</artifactId>
+ <version>6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/package.html
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-transport/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-transport/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -56,11 +56,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/DefaultTransportListener.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/FutureResponse.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/FutureResponse.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/FutureResponse.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/Transport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/Transport.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/Transport.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportAcceptListener.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFactory.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFilter.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportFilter.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportListener.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportListener.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportListener.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportServer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportServer.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/TransportServer.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgent.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryEvent.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryEvent.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryEvent.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
(empty)
Propchange: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/discovery/DiscoveryListener.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml Wed Jul 7 03:41:30 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
+ <artifactId>activemq-project</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
@@ -46,13 +46,17 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1.1</version>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>${commons-logging-version}</version>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
@@ -71,12 +75,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
+ <scope>test</scope>
+ <version>${junit-version}</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>