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 06:17:15 UTC
svn commit: r961196 - in /activemq/sandbox/activemq-apollo-actor:
activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/
activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/
Author: chirino
Date: Wed Jul 7 04:17:15 2010
New Revision: 961196
URL: http://svn.apache.org/viewvc?rev=961196&view=rev
Log:
Use the default connector protocol setting (the multi protocol)
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala?rev=961196&r1=961195&r2=961196&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala Wed Jul 7 04:17:15 2010
@@ -86,7 +86,7 @@ abstract class Connection() extends Defa
*/
class BrokerConnection(val connector: Connector, val id:Long) extends Connection {
- var protocol = "stomp"
+ var protocol = "multi"
var protocolHandler: ProtocolHandler = null;
override def toString = "id: "+id.toString
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala?rev=961196&r1=961195&r2=961196&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala Wed Jul 7 04:17:15 2010
@@ -98,6 +98,7 @@ class Connector(val broker:Broker, val i
accept_counter.incrementAndGet
var connection = new BrokerConnection(Connector.this, broker.connection_id_counter.incrementAndGet)
+ connection.protocol = config.protocol
connection.transport = transport
if( STICK_ON_THREAD_QUEUES ) {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala?rev=961196&r1=961195&r2=961196&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompBroker.scala Wed Jul 7 04:17:15 2010
@@ -42,10 +42,10 @@ object StompBroker {
println("log4j at: "+getClass.getClassLoader.getResource("log4j.properties"))
val broker = new Broker()
- val connector = broker.config.connectors.get(0)
- connector.bind = uri
- connector.protocol = "stomp"
- connector.advertise = uri
+// val connector = broker.config.connectors.get(0)
+// connector.bind = uri
+// connector.protocol = "stomp"
+// connector.advertise = uri
val store = storeType match {
case "none" =>