activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1076518 - in /activemq/activemq-apollo/trunk: apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/ apollo-broker/src/test/scala/org/apache/activemq/apollo...
Date Thu, 03 Mar 2011 04:54:03 GMT
Author: chirino
Date: Thu Mar  3 04:54:02 2011
New Revision: 1076518

URL: http://svn.apache.org/viewvc?rev=1076518&view=rev
Log:
removing advertise attribute from the connector.  Adding a list of internal and external ip
to the broker.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala?rev=1076518&r1=1076517&r2=1076518&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
Thu Mar  3 04:54:02 2011
@@ -41,7 +41,6 @@ object Connector extends Log {
   def defaultConfig() = {
     val rc = new ConnectorDTO
     rc.id = "default"
-    rc.advertise = "tcp://localhost:61613"
     rc.bind = "tcp://0.0.0.0:61613"
     rc.protocol = "multi"
     rc.connection_limit = 1000

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala?rev=1076518&r1=1076517&r2=1076518&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/transport/VMTransport.scala
Thu Mar  3 04:54:02 2011
@@ -130,7 +130,6 @@ class VMTransportFactory extends PipeTra
         val connector = Connector.defaultConfig
         connector.id = "vm"
         connector.bind = "vm://" + name
-        connector.advertise = connector.bind
 
         // Create the broker on demand.
         var broker: Broker = null

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala?rev=1076518&r1=1076517&r2=1076518&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BrokerPerfSupport.scala
Thu Mar  3 04:54:02 2011
@@ -200,7 +200,6 @@ abstract class BrokerPerfSupport extends
     val config = Broker.defaultConfig
     val connector = config.connectors.get(0)
     connector.bind = bindURI
-    connector.advertise = connectUri
     connector.protocol = getBrokerProtocolName
 
     val host = config.virtual_hosts.get(0)
@@ -288,7 +287,7 @@ abstract class BrokerPerfSupport extends
   }
 
   def connectUri(broker: Broker) = {
-    broker.config.connectors.get(0).advertise
+    broker.connectors.head.transport_server.getConnectURI.toString
   }
 
   def _createProducer(id: Int, messageSize: Int, destination: DestinationDTO): RemoteProducer
= {

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java?rev=1076518&r1=1076517&r2=1076518&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/BrokerDTO.java
Thu Mar  3 04:54:02 2011
@@ -47,7 +47,19 @@ public class BrokerDTO {
     @XmlElement(name="connector")
     public List<ConnectorDTO> connectors = new ArrayList<ConnectorDTO>();
 
-    
+
+    /**
+     * Internal IP address or host names of the broker
+     */
+    @XmlElement(name="internal_address")
+    public List<String> internal_addresses = new ArrayList<String>();
+
+    /**
+     * External IP address or host names of the broker
+     */
+    @XmlElement(name="external_address")
+    public List<String> external_addresses = new ArrayList<String>();
+
     /**
      * The base data directory of the broker.  It will store
      * persistent data under it.

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java?rev=1076518&r1=1076517&r2=1076518&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ConnectorDTO.java
Thu Mar  3 04:54:02 2011
@@ -42,12 +42,6 @@ public class ConnectorDTO extends Servic
     @XmlAttribute
     public String protocol;
 
-    /**
-     * The uri which will be advertised for remote endpoints to connect to.
-     */
-    @XmlAttribute
-    public String advertise;
-
     @XmlAttribute(name="connection_limit")
     public Integer connection_limit;
 



Mime
View raw message